Pārlūkot izejas kodu

Fix install for Debian 11 and older

FusionPBX 1 gadu atpakaļ
vecāks
revīzija
1da287d9a3

+ 6 - 3
debian/resources/php.sh

@@ -38,6 +38,9 @@ else
 	#8.x  - jessie
 	apt-get -y install apt-transport-https lsb-release ca-certificates
 
+	#make sure keyrings directory exits
+	mkdir /etc/apt/keyrings
+
 	if [ ."$os_codename" = ."jessie" ]; then
 		wget -O - https://packages.sury.org/php/apt.gpg | gpg --dearmor -o /etc/apt/keyrings/php.gpg
 		sh -c 'echo "deb [signed-by=/etc/apt/keyrings/php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
@@ -48,18 +51,18 @@ else
 	fi
 	if [ ."$os_codename" = ."buster" ]; then
 		wget -O - https://packages.sury.org/php/apt.gpg | gpg --dearmor -o /etc/apt/keyrings/php.gpg
-		sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+		sh -c 'echo "deb [signed-by=/etc/apt/keyrings/php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
 	fi
 	if [ ."$os_codename" = ."bullseye" ]; then
 		if [ ."$php_version" = ."8.1" ]; then
 			/usr/bin/apt -y install apt-transport-https lsb-release ca-certificates curl wget gnupg2
 			/usr/bin/wget -qO- https://packages.sury.org/php/apt.gpg | gpg --dearmor > /etc/apt/keyrings/sury-php-8.x.gpg
-			/usr/bin/sh -c 'echo "deb [signed-by=/etc/apt/keyrings/php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+			/usr/bin/sh -c 'echo "deb [signed-by=/etc/apt/keyrings/sury-php-8.x.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
 		fi
 		if [ ."$php_version" = ."8.2" ]; then
 			/usr/bin/apt -y install apt-transport-https lsb-release ca-certificates curl wget gnupg2
 			/usr/bin/wget -qO- https://packages.sury.org/php/apt.gpg | gpg --dearmor > /etc/apt/keyrings/sury-php-8.x.gpg
-			/usr/bin/sh -c 'echo "deb [signed-by=/etc/apt/keyrings/php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+			/usr/bin/sh -c 'echo "deb [signed-by=/etc/apt/keyrings/sury-php-8.x.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
 		fi
 	fi
  	if [ ."$os_codename" = ."bookworm" ]; then

+ 3 - 0
debian/resources/postgresql.sh

@@ -26,6 +26,9 @@ if [ ."$database_repo" = ."system" ]; then
 	fi
 fi
 
+#make sure keyrings directory exits
+mkdir /etc/apt/keyrings
+
 #postgres official repository
 if [ ."$database_repo" = ."official" ]; then
 	sh -c 'echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'

+ 4 - 1
debian/resources/sngrep.sh

@@ -8,6 +8,9 @@ cd "$(dirname "$0")"
 . ./colors.sh
 . ./environment.sh
 
+#make sure keyrings directory exits
+mkdir /etc/apt/keyrings
+
 #add sngrep
 if [ ."$cpu_architecture" = ."arm" ]; then
 	#source install
@@ -18,7 +21,7 @@ if [ ."$cpu_architecture" = ."arm" ]; then
 	cd /usr/src/sngrep && make install
 else
 	#package install
-	echo "deb [signed-by=/etc/apt/keyrings/irontec.gpg] http://packages.irontec.com/debian $os_codename main" > /etc/apt/sources.list.d/sngrep.list
+	echo "deb [signed-by=/etc/apt/keyrings/irontec.gpg] http://packages.irontec.com/debian $(lsb_release -cs) main" > /etc/apt/sources.list.d/sngrep.list
 	wget http://packages.irontec.com/public.key -q -O - | gpg --dearmor -o /etc/apt/keyrings/irontec.gpg
 	apt-get update
 	apt-get install -y sngrep