From 40167f89703f7e6fa2c171be62ec13c23ea1a64c Mon Sep 17 00:00:00 2001
From: Joulinar <47155374+Joulinar@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:00:49 +0100
Subject: [PATCH] v8.24

DietPi-Software | NZBGet: Update of the download URL due to a new project maintainer and switch to journal log
---
 dietpi/dietpi-software | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 dietpi/dietpi-software

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
old mode 100755
new mode 100644
index aec1c8659e..bb4eabe1ed
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -10101,32 +10101,33 @@ _EOF_
 		then
 			local reinstall=0
 			[[ -f '/mnt/dietpi_userdata/nzbget/nzbget.conf' ]] && reinstall=1
-			G_EXEC curl -sSfL 'https://nzbget.net/download/nzbget-latest-bin-linux.run' -o package.run
+
+			local fallback_url='https://github.com/nzbgetcom/nzbget/releases/download/v22.0/nzbget-22.0-bin-linux.run'
+			Download_Install "$(curl -sSfL 'https://api.github.com/repos/nzbgetcom/nzbget/releases/latest' | mawk -F\" '/^ *"browser_download_url": ".*\/nzbget-[^"/]*-bin-linux.run"$/{print $4}')" nzbget.run
 			G_EXEC mkdir -p /mnt/dietpi_userdata/nzbget
-			G_EXEC_OUTPUT=1 G_EXEC dash package.run --destdir /mnt/dietpi_userdata/nzbget
-			G_EXEC rm package.run
+			G_EXEC_OUTPUT=1 G_EXEC dash nzbget.run --destdir /mnt/dietpi_userdata/nzbget
+			G_EXEC rm nzbget.run
 
 			# User
 			Create_User -g dietpi -d /mnt/dietpi_userdata/nzbget nzbget
 
 			# Permissions
-			G_EXEC touch /var/log/nzbget.log
-			G_EXEC chown -R nzbget:root /mnt/dietpi_userdata/nzbget /var/log/nzbget.log
 			G_EXEC chmod 0600 /mnt/dietpi_userdata/nzbget/nzbget.conf
+			G_EXEC chown -R nzbget:root /mnt/dietpi_userdata/nzbget
 
 			# Config
 			if (( ! $reinstall ))
 			then
 				G_CONFIG_INJECT 'MainDir=' 'MainDir=/mnt/dietpi_userdata/downloads' /mnt/dietpi_userdata/nzbget/nzbget.conf
 				G_CONFIG_INJECT 'DestDir=' 'DestDir=/mnt/dietpi_userdata/downloads/complete' /mnt/dietpi_userdata/nzbget/nzbget.conf
-				G_CONFIG_INJECT 'LogFile=' 'LogFile=/var/log/nzbget.log' /mnt/dietpi_userdata/nzbget/nzbget.conf
+				G_CONFIG_INJECT 'WriteLog=' 'WriteLog=none' /mnt/dietpi_userdata/nzbget/nzbget.conf
 				G_CONFIG_INJECT 'ControlUsername=' 'ControlUsername=admin' /mnt/dietpi_userdata/nzbget/nzbget.conf
 				GCI_PASSWORD=1 G_CONFIG_INJECT 'ControlPassword=' "ControlPassword=$GLOBAL_PW" /mnt/dietpi_userdata/nzbget/nzbget.conf
 
 				# Umask: https://github.com/MichaIng/DietPi/issues/1999
 				G_CONFIG_INJECT 'UMask=' 'UMask=0002' /mnt/dietpi_userdata/nzbget/nzbget.conf
 
-				# Optimisations
+				# Optimisations: ToDo: Needs to be rechecked!
 				G_CONFIG_INJECT 'Server1.Cipher=' 'Server1.Cipher=RC4-MD5' /mnt/dietpi_userdata/nzbget/nzbget.conf
 				G_CONFIG_INJECT 'CrcCheck=' 'CrcCheck=no' /mnt/dietpi_userdata/nzbget/nzbget.conf
 				G_CONFIG_INJECT 'ParScan=' 'ParScan=limited' /mnt/dietpi_userdata/nzbget/nzbget.conf
@@ -10147,10 +10148,9 @@ Wants=network-online.target
 After=network-online.target remote-fs.target
 
 [Service]
-Type=forking
 User=nzbget
 WorkingDirectory=/mnt/dietpi_userdata/nzbget
-ExecStart=/mnt/dietpi_userdata/nzbget/nzbget -D
+ExecStart=/mnt/dietpi_userdata/nzbget/nzbget -so OutputMode=log
 
 [Install]
 WantedBy=multi-user.target