Skip to content

Commit

Permalink
v8.0
Browse files Browse the repository at this point in the history 
- DietPi-Software | Mosquitto: Applied a workaround on ARMv6 where the latest Mosquitto packages from the official APT repository are not ARMv6-compatible. Many thanks to @thomasmockridge for reporting this issue: #5140
- DietPi-Software | Bumped all fallback URLs and the Single File PHP Gallery version
  • Loading branch information
@MichaIng
MichaIng committed Jan 8, 2022
1 parent 6fe21e8 commit bb36da2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 17 deletions.
8 changes: 8 additions & 0 deletions .update/pre-patches
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,13 @@ then
G_EXEC apt-get -o 'Acquire::AllowReleaseInfoChange::Suite=true' -q update
fi

# v8.0: ARMv6: Remove Mosquitto repository: https://github.com/MichaIng/DietPi/issues/5140
if (( $G_HW_ARCH == 1 )) && (( $G_DIETPI_VERSION_CORE < 8 || ( $G_DIETPI_VERSION_CORE == 8 && $G_DIETPI_VERSION_SUB < 0 ) )) && [[ -f '/etc/apt/sources.list.d/dietpi-mosquitto.list' ]]
then
G_DIETPI-NOTIFY 2 'Removing Mosquitto APT repository as the latest builds are not compatible with ARMv6: https://github.com/MichaIng/DietPi/issues/5140'
G_EXEC rm /etc/apt/sources.list.d/dietpi-mosquitto.list
[[ -f '/etc/apt/trusted.gpg.d/dietpi-mosquitto.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg.d/dietpi-mosquitto.gpg
fi

exit 0
}
1 change: 1 addition & 0 deletions CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Fixes:
- DietPi-Software | myMPD: Resolved an issue where the installation failed due to an updated dependency. Many thanks to @supersexy for reporting this issue: https://github.com/MichaIng/DietPi/issues/5115
- DietPi-Software | Python 3: Worked around an issue where the pip reinstall failed. Many thanks to @hueppinr for reporting this issue: https://github.com/MichaIng/DietPi/issues/5117
- DietPi-Software | Unbound: Resolved an issue where the "unbound-resolvconf" service applied localhost automatically as local nameserver, if the "resolvconf" package was installed. Since often Unbound is installed in combination with Pi-hole or AdGuard Home, and those are usually used by network clients only, not the server itself, "unbound-resolvconf" is disabled now on Unbound installs. If Unbound is wanted as local resolver as well, it should be explicitly configured, e.g. via dietpi-config network options. Many thanks to @Ianszh for reporting this issue: https://github.com/MichaIng/DietPi/issues/5133
- DietPi-Software | Mosquitto: Applied a workaround on ARMv6 where the latest Mosquitto packages from the official APT repository are not ARMv6-compatible. Many thanks to @thomasmockridge for reporting this issue: https://github.com/MichaIng/DietPi/issues/5140

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/5146

Expand Down
35 changes: 18 additions & 17 deletions dietpi/dietpi-software
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2665,7 +2665,7 @@ _EOF_
local soundcard=$(sed -n '/^[[:blank:]]*CONFIG_SOUNDCARD=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
soundcard=${soundcard:-none}

# Enable defaults, if set to "none"
# Enable defaults if set to "none"
if [[ $soundcard == 'none' ]]; then

# RPi: Onboard auto, Others: default
Expand Down Expand Up @@ -3232,7 +3232,7 @@ unix_socket_directories = '/run/postgresql'" > "$i/00dietpi.conf"

# Get latest version
local file=$(curl -sSfL 'https://golang.org/dl/?mode=json' | grep -wo "go[0-9.]*\.linux-$arch\.tar\.gz" | head -1)
[[ $file ]] || { file="go1.17.4.linux-$arch.tar.gz"; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. \"$file\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
[[ $file ]] || { file="go1.17.6.linux-$arch.tar.gz"; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. \"$file\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }

# Reinstall: Remove previous instance
[[ -d '/usr/local/go' ]] && G_EXEC rm -R /usr/local/go
Expand Down Expand Up @@ -4502,7 +4502,7 @@ _EOF_

# Download latest version
local version=$(curl -sSfL 'https://dist.ipfs.io/go-ipfs/versions' | tail -1)
[[ $version ]] || { version='v0.11.0-rc2'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} 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='v0.12.0-rc1'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} 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://dist.ipfs.io/go-ipfs/$version/go-ipfs_${version}_linux-$arch.tar.gz"

# Install
Expand Down Expand Up @@ -5846,7 +5846,7 @@ _EOF_
G_CHECK_URL "$url"

# Latest known version
local latest='2.4.13'
local latest='2.4.14'

# ARMv7
local fallback_url="https://hndl.urbackup.org/Server/$latest/urbackup-server_${latest}_armhf.deb"
Expand Down Expand Up @@ -6791,7 +6791,7 @@ _EOF_
Download_Install 'https://github.com/airsonic-advanced/airsonic-advanced/releases/download/v10.6.0/airsonic.war' /mnt/dietpi_userdata/airsonic/airsonic.war
else
# Since v11 is not yet released, pull latest pre-release
local fallback_url='https://github.com/airsonic-advanced/airsonic-advanced/releases/download/11.0.0-SNAPSHOT.20211220002741/airsonic.war'
local fallback_url='https://github.com/airsonic-advanced/airsonic-advanced/releases/download/11.0.0-SNAPSHOT.20220104090313/airsonic.war'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/airsonic-advanced/airsonic-advanced/releases' | mawk -F\" '/"browser_download_url": .*\/airsonic\.war"/{print $4;exit}')" /mnt/dietpi_userdata/airsonic/airsonic.war
fi

Expand Down Expand Up @@ -7182,7 +7182,8 @@ _EOF_
Banner_Installing

# Use official APT repository where available: https://repo.mosquitto.org/debian/pool/main/m/mosquitto/
if [[ $G_HW_ARCH != 3 ]]
# - Current builds are not ARMv6 compatible: https://github.com/MichaIng/DietPi/issues/5140
if [[ $G_HW_ARCH != [13] ]]
then
# APT key
local url='https://repo.mosquitto.org/debian/mosquitto-repo.gpg.key'
Expand Down Expand Up @@ -7983,7 +7984,7 @@ _EOF_
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
local fallback_url='https://github.com/gotson/komga/releases/download/v0.134.1/komga-0.134.1.jar'
local fallback_url='https://github.com/gotson/komga/releases/download/v0.143.0/komga-0.143.0.jar'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/gotson/komga/releases/latest' | mawk -F\" '/"browser_download_url": .*\/komga-[^"\/]*\.jar"/{print $4}')" /mnt/dietpi_userdata/komga/komga.jar

# User
Expand Down Expand Up @@ -8045,7 +8046,7 @@ _EOF_

# Install required PHP modules: https://sye.dk/sfpg/
DEPS_LIST="$PHP_NAME-gd"
Download_Install 'https://sye.dk/sfpg/Single_File_PHP_Gallery_4.8.0.zip' /var/www/gallery
Download_Install 'https://sye.dk/sfpg/Single_File_PHP_Gallery_4.8.1.zip' /var/www/gallery

# Enable required PHP modules
G_EXEC phpenmod gd
Expand Down Expand Up @@ -8082,7 +8083,7 @@ _EOF_
# Bullseye+
if (( $G_DISTRO > 5 ))
then
local fallback_url='https://github.com/ampache/ampache/releases/download/5.1.1/ampache-5.1.1_all.zip'
local fallback_url='https://github.com/ampache/ampache/releases/download/5.2.0/ampache-5.2.0_all.zip'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/ampache/ampache/releases/latest' | mawk -F\" '/"browser_download_url": ".*\/ampache-[0-9\.]*_all.zip"/{print $4}')" ampache

# Ampache v5 requires PHP7.4, hence pull latest Ampache v4 on Buster: https://github.com/ampache/ampache/wiki/Ampache-Next-Changes
Expand Down Expand Up @@ -8908,7 +8909,7 @@ _EOF_
# APT deps: https://github.com/sabre-io/Baikal/wiki/Baïkal-dependencies
DEPS_LIST="$PHP_NAME-xml $PHP_NAME-mbstring $PHP_NAME-mysql"

local fallback_url='https://github.com/sabre-io/Baikal/releases/download/0.8.0/baikal-0.8.0.zip'
local fallback_url='https://github.com/sabre-io/Baikal/releases/download/0.9.1/baikal-0.9.1.zip'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/sabre-io/Baikal/releases/latest' | mawk -F\" '/"browser_download_url": .*\/baikal-[^"\/]*\.zip"/{print $4}')"

# Reinstall: https://sabre.io/baikal/upgrade/
Expand Down Expand Up @@ -10234,7 +10235,7 @@ _EOF_

# Download
local version=$(curl -sSfL 'https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest' | mawk -F\" '/"tag_name": /{print $4}')
[[ $version ]] || { version='1.23.0'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} 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.23.1'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} 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/dani-garcia/vaultwarden/archive/$version.tar.gz"

# Replace old instance on reinstall using new project name
Expand Down Expand Up @@ -10417,7 +10418,7 @@ _EOF_
DEPS_LIST="$PHP_NAME-bcmath $PHP_NAME-json $PHP_NAME-mbstring $PHP_NAME-xml $PHP_NAME-curl $PHP_NAME-sqlite3"

# Grab latest release
local fallback_url='https://github.com/koel/koel/releases/download/v5.1.8/koel-v5.1.8.tar.gz'
local fallback_url='https://github.com/koel/koel/releases/download/v5.1.12/koel-v5.1.12.tar.gz'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/koel/koel/releases/latest' | mawk -F\" '/"browser_download_url": .*\/koel-[^"\/]*\.tar\.gz"/{print $4}')"

# Reinstall: Clear previous install, but keep existing config file
Expand Down Expand Up @@ -10940,7 +10941,7 @@ _EOF_

# - ARMv6: Requires Mono: https://github.com/Jackett/Jackett#installation-on-linux-armv6-or-below
local url=$(curl -sSfL 'https://api.github.com/repos/Jackett/Jackett/releases/latest' | mawk -F\" '/"browser_download_url": .*\/Jackett\.Binaries\.Mono\.tar\.gz"/{print $4}')
local fallback_url='https://github.com/Jackett/Jackett/releases/download/v0.20.123/Jackett.Binaries.Mono.tar.gz'
local fallback_url='https://github.com/Jackett/Jackett/releases/download/v0.20.266/Jackett.Binaries.Mono.tar.gz'

# - ARMv7
if (( $G_HW_ARCH == 2 )); then
Expand Down Expand Up @@ -11540,7 +11541,7 @@ _EOF_
arch='amd64'
fi

local fallback_url="https://github.com/go-gitea/gitea/releases/download/v1.15.7/gitea-1.15.7-linux-$arch"
local fallback_url="https://github.com/go-gitea/gitea/releases/download/v1.15.9/gitea-1.15.9-linux-$arch"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/go-gitea/gitea/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/gitea-[^\"\/]*-linux-$arch\"/{print \$4}")" /mnt/dietpi_userdata/gitea/gitea

# User
Expand Down Expand Up @@ -12352,7 +12353,7 @@ _EOF_
local arch='armhf'
(( $G_HW_ARCH == 10 )) && arch='amd64'

local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.25.0/snapserver_0.25.0-1_$arch.deb"
local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.26.0/snapserver_0.26.0-1_$arch.deb"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/snapserver_[^\"\/]*_$arch.deb\"/{print \$4}")"
G_EXEC systemctl stop snapserver

Expand All @@ -12369,7 +12370,7 @@ _EOF_
local arch='armhf'
(( $G_HW_ARCH == 10 )) && arch='amd64'

local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.25.0/snapclient_0.25.0-1_without-pulse_$arch.deb"
local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.26.0/snapclient_0.26.0-1_without-pulse_$arch.deb"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/snapclient_[^\"\/]*_without-pulse_$arch.deb\"/{print \$4}")"
G_EXEC systemctl stop snapclient

Expand Down Expand Up @@ -12427,7 +12428,7 @@ _EOF_

fi

local fallback_url="https://github.com/filebrowser/filebrowser/releases/download/v2.19.0/linux-$arch-filebrowser.tar.gz"
local fallback_url="https://github.com/filebrowser/filebrowser/releases/download/v2.20.1/linux-$arch-filebrowser.tar.gz"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/filebrowser/filebrowser/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/linux-$arch-filebrowser\.tar\.gz\"/{print \$4}")" ./filebrowser/

# Reinstall
Expand Down

0 comments on commit bb36da2

Please sign in to comment.