[neon/neon/keyring/Neon/release] debian: set the env var to an empty string if no result returned
Carlos De Maine
null at kde.org
Thu Sep 26 15:37:23 BST 2024
Git commit 3f9908f370fcf20db38f5fbb20fffe495e84bf31 by Carlos De Maine.
Committed on 26/09/2024 at 14:37.
Pushed by carlosdem into branch 'Neon/release'.
set the env var to an empty string if no result returned
M +5 -7 debian/neon-keyring.postinst
https://invent.kde.org/neon/neon/keyring/-/commit/3f9908f370fcf20db38f5fbb20fffe495e84bf31
diff --git a/debian/neon-keyring.postinst b/debian/neon-keyring.postinst
index 87c5879..bb0ae88 100644
--- a/debian/neon-keyring.postinst
+++ b/debian/neon-keyring.postinst
@@ -11,15 +11,13 @@ if [ "$NEONARCHIVE_USER" = "user" ];
then NEONARCHIVE=$NEONARCHIVE_USER;
# guard against release edition testing setups
if [ -e /etc/apt/sources.list.d/neon.sources ]; then
- NEONARCHIVE_RELEASE=$(grep -o http://archive.neon.kde.org/release /etc/apt/sources.list.d/neon.sources)
- if [ "$NEONARCHIVE_RELEASE" = "http://archive.neon.kde.org/release" ];
- then NEONARCHIVE="release";
- fi
+ NEONARCHIVE_RELEASE="$(grep -o http://archive.neon.kde.org/release /etc/apt/sources.list.d/neon.sources)"
+
elif [ -e /etc/apt/sources.list.d/neon.list ]; then
- NEONARCHIVE_RELEASE=$(grep -o -m 1 http://archive.neon.kde.org/release /etc/apt/sources.list.d/neon.list)
- if [ "$NEONARCHIVE_RELEASE" = "http://archive.neon.kde.org/release" ];
+ NEONARCHIVE_RELEASE="$(grep -o -m 1 http://archive.neon.kde.org/release /etc/apt/sources.list.d/neon.list)"
+ fi
+ if [ "$NEONARCHIVE_RELEASE" = "http://archive.neon.kde.org/release" ];
then NEONARCHIVE="release";
- fi
fi
fi
# testing edition (in the future will need guards for stable edition testing iso's)
More information about the Neon-commits
mailing list