v9.7 (#7197)

- DietPi-Software | Snapcast: Fix install on Trixie
MichaIng · Aug 26, 2024 · 2c429ef · 2c429ef
2 parents 85247e0 + aa8e2d9
commit 2c429ef
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -11586,8 +11586,8 @@ _EOF_
 
 		if To_Install 191 snapserver # Snapcast Server
 		then
-			# RISC-V: Install from Debian repo: https://github.com/badaix/snapcast/releases
-			if (( $G_HW_ARCH == 11 ))
+			# RISC-V/Trixie: Install from Debian repo: https://github.com/badaix/snapcast/releases
+			if (( $G_DISTRO > 7 ))
 			then
 				G_AGI snapserver
 
@@ -11600,9 +11600,9 @@ _EOF_
 				[[ -d '/var/lib/snapserver' ]] && G_EXEC chown -R '_snapserver:_snapserver' /var/lib/snapserver
 				getent passwd snapserver > /dev/null && G_EXEC userdel snapserver
 			else
-				local arch=$(dpkg --print-architecture) dist=${G_DISTRO_NAME/trixie/bookworm}
-				local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.29.0/snapserver_0.29.0-1_${arch}_$dist.deb"
-				Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/snapserver_[^\"\/]*_${arch}_$dist.deb\"/{print \$4}")"
+				local arch=$(dpkg --print-architecture)
+				local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.29.0/snapserver_0.29.0-1_${arch}_$G_DISTRO_NAME.deb"
+				Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/snapserver_[^\"\/]*_${arch}_$G_DISTRO_NAME.deb\"/{print \$4}")"
 
 				# Fix /var/lib/snapserver permissions, just in case Debian's package was previously used, which uses the "_snapserver" user, instead of "snapserver"
 				[[ -d '/var/lib/snapserver' ]] && G_EXEC chown -R 'snapserver:snapserver' /var/lib/snapserver
@@ -11616,14 +11616,14 @@ _EOF_
 
 		if To_Install 192 snapclient # Snapcast Client
 		then
-			# RISC-V: Install from Debian repo: https://github.com/badaix/snapcast/releases
-			if (( $G_HW_ARCH == 11 ))
+			# RISC-V/Trixie: Install from Debian repo: https://github.com/badaix/snapcast/releases
+			if (( $G_DISTRO > 7 ))
 			then
 				G_AGI snapclient
 			else
-				local arch=$(dpkg --print-architecture) dist=${G_DISTRO_NAME/trixie/bookworm}
-				local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.29.0/snapclient_0.29.0-1_${arch}_$dist.deb"
-				Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/snapclient_[^\"\/]*_${arch}_$dist.deb\"/{print \$4}")"
+				local arch=$(dpkg --print-architecture)
+				local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.29.0/snapclient_0.29.0-1_${arch}_$G_DISTRO_NAME.deb"
+				Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/snapclient_[^\"\/]*_${arch}_$G_DISTRO_NAME.deb\"/{print \$4}")"
 			fi
 			G_EXEC systemctl stop snapclient