[neon/neon/keyring/Neon/release] debian: another iteration

Carlos De Maine null at kde.org
Thu Sep 26 15:59:28 BST 2024


Git commit 7081546a8c6eed77f3c2738aeb93948cda995d12 by Carlos De Maine.
Committed on 26/09/2024 at 14:59.
Pushed by carlosdem into branch 'Neon/release'.

another iteration

M  +4    -5    debian/neon-keyring.postinst

https://invent.kde.org/neon/neon/keyring/-/commit/7081546a8c6eed77f3c2738aeb93948cda995d12

diff --git a/debian/neon-keyring.postinst b/debian/neon-keyring.postinst
index bb0ae88..b867cd6 100644
--- a/debian/neon-keyring.postinst
+++ b/debian/neon-keyring.postinst
@@ -10,12 +10,11 @@ NEONARCHIVE_USER=$(grep -o User /etc/lsb-release | tr '[:upper:]' '[:lower:]' )
 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)"
-		
-	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)"
+	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 -m 1 http://archive.neon.kde.org/release /etc/apt/sources.list.d/neon.list)
 	if [ "$NEONARCHIVE_RELEASE" = "http://archive.neon.kde.org/release" ];
 		then NEONARCHIVE="release";
 	fi


More information about the Neon-commits mailing list