dietpi-software: enable Domoticz to test libssl dep of binaries

MichaIng · Jan 31, 2025 · 23229a9 · 23229a9
1 parent 9ea98e2
commit 23229a9
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -1538,9 +1538,6 @@ Available commands:
 		aSOFTWARE_CATX[$software_id]=17
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/home_automation/#domoticz'
 		# - RISC-V: https://github.com/domoticz/domoticz/releases, https://www.domoticz.com/downloads/
-		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
-		# - Bookworm/Trixie ARM: https://github.com/domoticz/domoticz/issues/5233#issuecomment-1904906172
-		(( $G_HW_ARCH < 10 && $G_DISTRO > 6 )) && aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]=0
 		#------------------
 		software_id=27
 		aSOFTWARE_NAME[$software_id]='TasmoAdmin'
@@ -11440,15 +11437,16 @@ _EOF_
 		then
 			# APT deps: https://install.domoticz.com/, https://github.com/MichaIng/DietPi/issues/6404
 			aDEPS=('libusb-0.1-4' 'libcurl3-gnutls')
+			(( $G_DISTRO == 8 )) && aDEPS+=('libcurl3t64-gnutls') || aDEPS=('libcurl3-gnutls')
 
 			# x86_64 builds provided via GitHub differ from those provided via domoticz.com and were compiled against libssl3. Hence download those for Bookworm/Trixie systems, else the ones from domoticz.com, compiled against libssl1.1. Currently, there are no builds for ARM and libssl3.
-			if (( $G_HW_ARCH == 10 && $G_DISTRO > 6 ))
-			then
-				local fallback_url="https://github.com/domoticz/domoticz/releases/download/2024.1/domoticz_linux_2024.1_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz"
-				Download_Install "$(curl -sSfL 'https://api.github.com/repos/domoticz/domoticz/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/domoticz_linux_[^\"\/]*_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz\"$/{print \$4}")" ./domoticz
-			else
+			#if (( $G_HW_ARCH == 10 && $G_DISTRO > 6 ))
+			#then
+			#	local fallback_url="https://github.com/domoticz/domoticz/releases/download/2024.1/domoticz_linux_2024.1_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz"
+			#	Download_Install "$(curl -sSfL 'https://api.github.com/repos/domoticz/domoticz/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/domoticz_linux_[^\"\/]*_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz\"$/{print \$4}")" ./domoticz
+			#else
 				Download_Install "https://releases.domoticz.com/release/domoticz_linux_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz" ./domoticz
-			fi
+			#fi
 
 			# Reinstall: Clean old install dir
 			[[ -d '/opt/domoticz' ]] && G_EXEC rm -R /opt/domoticz