Skip to content

Commit

Permalink
dietpi-software: Domoticz: update download URL
Browse files Browse the repository at this point in the history
Fixes: #7375

Additionally, some minor coding enhancements/hardenings have been applied.
  • Loading branch information
MichaIng committed Jan 28, 2025
1 parent e145ed1 commit 4c5457c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Bug fixes:
- DietPi-Software | Bazarr: Resolved an issue where the installation failed on Trixie systems due to missing build dependencies.
- DietPi-Software | Mono: Resolved an issue where the installation failed on Trixie systems due to conflicting dependencies of packages from the Mono repo. It is now installed from the Debian repository, which ships the latest version since Trixie.
- DietPi-Software | Gogs: Resolved an issue where the installation failed on ARMv7 systems, since the latest release v0.13.2 does not provide binaries for this architecture anymore. We provide now own builds for those, like we do for ARMv6 and RISC-V already.
- DietPi-Software | Domoticz: Resolved an issue where the installation failed, because of a changed download URL. Many thanks to @IgrekLg for reporting this issue: https://github.com/MichaIng/DietPi/issues/7375

As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/ADDME

Expand Down
28 changes: 14 additions & 14 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -4908,11 +4908,11 @@ The install script will now exit. After applying one of the the above, rerun die
if To_Install 121 roonbridge # Roon Bridge
then
case $G_HW_ARCH in
2) local url='https://download.roonlabs.net/builds/RoonBridge_linuxarmv7hf.tar.bz2';;
3) local url='https://download.roonlabs.net/builds/RoonBridge_linuxarmv8.tar.bz2';;
*) local url='https://download.roonlabs.net/builds/RoonBridge_linuxx64.tar.bz2';;
2) local arch='rmv7hf';;
3) local arch='armv8';;
*) local arch='x64';;
esac
Download_Install "$url"
Download_Install "https://download.roonlabs.net/builds/RoonBridge_linuxa$arch.tar.bz2"

# Always perform a clean install
[[ -d '/opt/roonbridge' ]] && G_EXEC rm -R /opt/roonbridge
Expand Down Expand Up @@ -5047,7 +5047,7 @@ _EOF_

# Do not pre-create obsolete cache dir
G_EXEC mkdir -p /etc/systemd/system/mopidy.service.d
echo -e '[Service]\nExecStartPre=' > /etc/systemd/system/mopidy.service.d/dietpi.conf
G_EXEC eval 'echo -e '\''[Service]\nExecStartPre='\'' > /etc/systemd/system/mopidy.service.d/dietpi.conf'

Download_Test_Media
fi
Expand Down Expand Up @@ -5784,11 +5784,11 @@ _EOF_
G_EXEC eval "echo 'nameserver 127.0.0.1' > /etc/resolv.conf" # Unbound is running and configured in the very next config step, so it is safe to switch the DNS nameserver right now.
fi

echo 'ControlPort 9051' >> /etc/tor/torrc
echo 'CookieAuthentication 1' >> /etc/tor/torrc
[[ $nickname ]] && echo "Nickname $nickname" >> /etc/tor/torrc
[[ $email ]] && echo "ContactInfo $email" >> /etc/tor/torrc
[[ $ipv6 ]] && echo "ORPort [$ipv6]:$orport" >> /etc/tor/torrc
G_EXEC eval 'echo '\''ControlPort 9051'\'' >> /etc/tor/torrc'
G_EXEC eval 'echo '\''CookieAuthentication 1'\'' >> /etc/tor/torrc'
[[ $nickname ]] && G_EXEC eval "echo 'Nickname $nickname' >> /etc/tor/torrc"
[[ $email ]] && G_EXEC eval "echo 'ContactInfo $email' >> /etc/tor/torrc"
[[ $ipv6 ]] && G_EXEC eval "echo 'ORPort [$ipv6]:$orport' >> /etc/tor/torrc"
fi

if To_Install 182 unbound # Unbound
Expand Down Expand Up @@ -11504,16 +11504,16 @@ _EOF_

if To_Install 140 domoticz # Domoticz
then
# APT deps
aDEPS=('libusb-0.1-4' 'libcurl3-gnutls') # https://github.com/MichaIng/DietPi/issues/6404
# APT deps: https://install.domoticz.com/, https://github.com/MichaIng/DietPi/issues/6404
aDEPS=('libusb-0.1-4' '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 not builds for ARM and libssl3.
# 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
Download_Install "https://releases.domoticz.com/releases/release/domoticz_linux_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz" ./domoticz
Download_Install "https://releases.domoticz.com/release/domoticz_linux_${G_HW_ARCH_NAME/armv6l/armv7l}.tgz" ./domoticz
fi

# Reinstall: Clean old install dir
Expand Down

0 comments on commit 4c5457c

Please sign in to comment.