v6.26

+ DietPi-Software | Sonarr: Switch to long version APT repo key
+ DietPi-Software | Sonarr: Update ARMv8 binary download to new forwarded download URL
+ DietPi-Software | Mono: Use Raspbian repo for all RPis
+ DietPi-Software | Raspotify: Switch APT repo to new "raspotify" code name, "jessie" was just left as link for backwards compatibility
+ DietPi-Software | Add tailing slash to APT repo URLs to avoid one 301 redirect

dietpi/dietpi-software

@@ -4542,7 +4542,7 @@ _EOF_
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
 			curl -sSL "$INSTALL_URL_ADDRESS" | apt-key add -
-			echo "deb https://repos.influxdata.com/debian $G_DISTRO_NAME stable" > /etc/apt/sources.list.d/influxdb.list
+			echo "deb https://repos.influxdata.com/debian/ $G_DISTRO_NAME stable" > /etc/apt/sources.list.d/influxdb.list
 			G_AGUP
 
 			G_AGI influxdb
@@ -4556,11 +4556,11 @@ _EOF_
 
 			# APT repo GPG key
 			INSTALL_URL_ADDRESS='https://packages.grafana.com/gpg.key'
-			local deb_address='deb https://packages.grafana.com/oss/deb stable main'
+			local deb_address='deb https://packages.grafana.com/oss/deb/ stable main'
 			if (( $G_HW_ARCH == 1 )); then
 
 				INSTALL_URL_ADDRESS='https://bintray.com/user/downloadSubjectPublicKey?username=bintray'
-				deb_address="deb https://dl.bintray.com/fg2it/deb-rpi-1b $G_DISTRO_NAME main"
+				deb_address="deb https://dl.bintray.com/fg2it/deb-rpi-1b/ $G_DISTRO_NAME main"
 
 			fi
 
@@ -5027,7 +5027,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=sid\nPin-Prior
 			curl -sSL "$INSTALL_URL_ADDRESS" | apt-key add -
 
 			# Apply APT repo
-			echo 'deb https://downloads.plex.tv/repo/deb public main' > /etc/apt/sources.list.d/plexmediaserver.list
+			echo 'deb https://downloads.plex.tv/repo/deb/ public main' > /etc/apt/sources.list.d/plexmediaserver.list
 
 			# Update APT lists
 			G_AGUP
@@ -5448,12 +5448,12 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=sid\nPin-Prior
 			if (( $G_HW_ARCH == 3 )); then
 
 				DEPS_LIST='mediainfo'
-				Download_Install 'https://update.sonarr.tv/v2/develop/mono/NzbDrone.develop.tar.gz' /opt
+				Download_Install 'https://download.sonarr.tv/v2/develop/mono/NzbDrone.develop.tar.gz' /opt
 
 			# Repo install
 			else
 
-				apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC
+				apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xA236C58F409091A18ACA53CBEBFF6B99D9B78493
 				echo 'deb https://apt.sonarr.tv/ develop main' > /etc/apt/sources.list.d/sonarr.list
 				G_AGUP
 				G_AGI nzbdrone
@@ -5890,13 +5890,13 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 		software_id=167 # Raspotify
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
-			Banner_Installing
+			Banner_Installing # https://dtcooper.github.io/raspotify/#hard-installation
 
 			INSTALL_URL_ADDRESS='https://dtcooper.github.io/raspotify/key.asc'
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
 			curl -sSL "$INSTALL_URL_ADDRESS" | apt-key add -
-			echo 'deb https://dtcooper.github.io/raspotify jessie main' > /etc/apt/sources.list.d/raspotify.list
+			echo 'deb https://dtcooper.github.io/raspotify/ raspotify main' > /etc/apt/sources.list.d/raspotify.list
 			G_AGUP
 
 			G_AGI raspotify
@@ -6546,27 +6546,27 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y
 		software_id=150 # Mono runtime
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
-			Banner_Installing
+			Banner_Installing # https://www.mono-project.com/download/stable/#download-lin-debian
 
 			apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 
-			# RPis + ARMv6 only available in Raspbian repo: https://github.com/MichaIng/DietPi/issues/1023
-			if (( $G_HW_MODEL < 10 || $G_HW_ARCH == 1 )); then
+			# On RPi use separate Raspbian repo: https://github.com/MichaIng/DietPi/issues/1023
+			if (( $G_HW_MODEL < 10 )); then
 
-				echo "deb https://download.mono-project.com/repo/debian raspbian$G_DISTRO_NAME main" > /etc/apt/sources.list.d/mono-xamarin.list
+				echo "deb https://download.mono-project.com/repo/debian/ raspbian$G_DISTRO_NAME main" > /etc/apt/sources.list.d/mono-xamarin.list
 
 			else
 
-				echo "deb https://download.mono-project.com/repo/debian $G_DISTRO_NAME main" > /etc/apt/sources.list.d/mono-xamarin.list
+				echo "deb https://download.mono-project.com/repo/debian/ $G_DISTRO_NAME main" > /etc/apt/sources.list.d/mono-xamarin.list
 
 			fi
 			# - Buster: Revert to Stretch, since Buster is not yet available
 			sed -i 's/buster/stretch/g' /etc/apt/sources.list.d/mono-xamarin.list
 
 			G_AGUP
-
 			G_AGI mono-runtime mono-complete
-			rm /tmp/mono* &> /dev/null # https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403856446
+
+			rm -f /tmp/mono* # https://github.com/MichaIng/DietPi/issues/1877#issuecomment-403856446
 
 		fi