Skip to content

Commit

Permalink
v9.7
Browse files Browse the repository at this point in the history 
- DietPi-Software | Update fallback URL and revert Snapcast back to direct DEB package downloads, which are available again with latest release
  • Loading branch information
@MichaIng
MichaIng committed Aug 25, 2024
1 parent 387706a commit d9690d6
Showing 1 changed file with 10 additions and 14 deletions.
24 changes: 10 additions & 14 deletions dietpi/dietpi-software
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6522,7 +6522,7 @@ _EOF_
esac

# Download
local fallback_url="https://github.com/fatedier/frp/releases/download/v0.59.0/frp_0.59.0_linux_$arch.tar.gz"
local fallback_url="https://github.com/fatedier/frp/releases/download/v0.60.0/frp_0.60.0_linux_$arch.tar.gz"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/fatedier/frp/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/frp_[0-9.]*_linux_$arch\.tar\.gz\"/{print \$4}")"

G_EXEC cd frp_*
Expand Down Expand Up @@ -7057,7 +7057,7 @@ _EOF_
aDEPS=()
else
local version=$(curl -sSfL 'https://api.github.com/repos/FreshRSS/FreshRSS/releases/latest' | mawk -F\" '/^ *"tag_name": "[^"]*",$/{print $4}')
[[ $version ]] || { version='1.24.1'; G_DIETPI-NOTIFY 1 "Automatic latest FreshRSS version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
[[ $version ]] || { version='1.24.2'; G_DIETPI-NOTIFY 1 "Automatic latest FreshRSS version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
Download_Install "https://github.com/FreshRSS/FreshRSS/archive/$version.tar.gz"
G_EXEC mv "FreshRSS-$version" /opt/FreshRSS
fi
Expand Down Expand Up @@ -9364,7 +9364,7 @@ _EOF_
if (( ${PHP_VERSION::1} > 7 ))
then
aDEPS+=("php$PHP_VERSION-curl")
local fallback_url='https://github.com/koel/koel/releases/download/v7.0.9/koel-v7.0.9.tar.gz' aphp_deps=('curl' 'dom')
local fallback_url='https://github.com/koel/koel/releases/download/v7.0.10/koel-v7.0.10.tar.gz' aphp_deps=('curl' 'dom')
Download_Install "$(curl -sSfL 'https://api.github.com/repos/koel/koel/releases/latest' | mawk -F\" '/^ *"browser_download_url": ".*\/koel-[^"\/]*\.tar\.gz"$/{print $4}')"
else
aDEPS+=("php$PHP_VERSION-json")
Expand Down Expand Up @@ -9546,7 +9546,7 @@ _EOF_
esac

url=$(curl -sSfL 'https://api.github.com/repos/Radarr/Radarr/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*linux-core-$arch\.tar\.gz\"$/{print \$4}")
local fallback_url="https://github.com/Radarr/Radarr/releases/download/v5.8.3.8933/Radarr.master.5.8.3.8933.linux-core-$arch.tar.gz"
local fallback_url="https://github.com/Radarr/Radarr/releases/download/v5.9.1.9070/Radarr.master.5.9.1.9070.linux-core-$arch.tar.gz"
fi

Download_Install "$url"
Expand Down Expand Up @@ -9988,7 +9988,7 @@ _EOF_
*) local arch='x64';;
esac

local fallback_url="https://github.com/Prowlarr/Prowlarr/releases/download/v1.21.2.4649/Prowlarr.master.1.21.2.4649.linux-core-$arch.tar.gz"
local fallback_url="https://github.com/Prowlarr/Prowlarr/releases/download/v1.22.0.4670/Prowlarr.master.1.22.0.4670.linux-core-$arch.tar.gz"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*linux-core-$arch\.tar\.gz\"$/{print \$4}")"
G_EXEC mv Prowlarr /opt/prowlarr
fi
Expand Down Expand Up @@ -11592,7 +11592,7 @@ _EOF_
G_AGI snapserver

# Install and enable snapweb web UI, not included in Debian's snapserver package: https://github.com/MichaIng/DietPi/issues/7073
local fallback_url='https://github.com/badaix/snapweb/releases/download/v0.7.0/snapweb_0.7.0-1_all.deb'
local fallback_url='https://github.com/badaix/snapweb/releases/download/v0.8.0/snapweb_0.8.0-1_all.deb'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapweb/releases/latest' | mawk -F\" '/^ *"browser_download_url": ".*\/snapweb_[^"\/]*_all.deb"/{print $4}')"
G_CONFIG_INJECT 'doc_root[[:blank:]=]' 'doc_root = /usr/share/snapweb' /etc/snapserver.conf '\[http\]'

Expand All @@ -11601,10 +11601,8 @@ _EOF_
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.28.0/snapcast_0.28.0_$arch-debian-$dist.zip"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/snapcast_[^\"\/]*_$arch-debian-$dist.zip\"/{print \$4}")"
G_AGI ./snapserver_*_"$arch.deb"
G_EXEC rm snap*.deb
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}")"

# 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
Expand All @@ -11624,10 +11622,8 @@ _EOF_
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.28.0/snapcast_0.28.0_$arch-debian-$dist.zip"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/snapcast_[^\"\/]*_$arch-debian-$dist.zip\"/{print \$4}")"
G_AGI ./snapclient_*_without-pulse_"$arch.deb"
G_EXEC rm snap*.deb
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}")"
fi
G_EXEC systemctl stop snapclient

Expand Down

0 comments on commit d9690d6

Please sign in to comment.