From dd4721c8f64e3918e05484cbf6a9b1d5b13cf70a Mon Sep 17 00:00:00 2001
From: Jan Koudijs <theappgineer@gmail.com>
Date: Wed, 19 May 2021 20:25:11 +0200
Subject: [PATCH] DietPi-Software | Update Roon Extension Manager to v1.0

---
 dietpi/dietpi-software | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 5e7b45c8f9..e737ebf66e 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -642,7 +642,7 @@ INDEX_BROWSER_TARGET=$INDEX_BROWSER_TARGET"
 		aSOFTWARE_DESC[$software_id]='Manage extensions from within Roon'
 		aSOFTWARE_CATX[$software_id]=2
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/media/#roon-extension-manager'
-		aSOFTWARE_DEPS[$software_id]='9 17'
+		aSOFTWARE_DEPS[$software_id]='162'
 		#------------------
 		software_id=178
 
@@ -2114,6 +2114,7 @@ INDEX_BROWSER_TARGET=$INDEX_BROWSER_TARGET"
 			# Unmark Docker dependants as well
 			(( ${aSOFTWARE_INSTALL_STATE[134]} == 1 )) && aSOFTWARE_INSTALL_STATE[134]=0
 			(( ${aSOFTWARE_INSTALL_STATE[185]} == 1 )) && aSOFTWARE_INSTALL_STATE[185]=0
+			(( ${aSOFTWARE_INSTALL_STATE[86]} == 1 )) && aSOFTWARE_INSTALL_STATE[86]=0
 		fi
 
 		# If OctoPrint and mjpg-streamer both are installed, OctoPrint is automatically configured to use mjpg-streamer. For the integrated time-lapse feature, FFmpeg is required.
@@ -4744,7 +4745,7 @@ _EOF_
 
 			# Service
 			Remove_SysV webiopi 1
-			cat << _EOF_ > /etc/systemd/system/webiopi.service 
+			cat << _EOF_ > /etc/systemd/system/webiopi.service
 [Unit]
 Description=WebIOPi (DietPi)
 Wants=network-online.target
@@ -6609,13 +6610,18 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 
 			Banner_Installing
 
-			INSTALL_URL_ADDRESS='https://github.com/TheAppgineer/roon-extension-manager-packaging/raw/master/linux/setup.sh'
+			# Restart Docker service to be able to deploy the container
+			G_DIETPI-NOTIFY 2 'Docker will be restarted to be able to deploy the container.'
+			G_EXEC systemctl daemon-reload
+			G_EXEC systemctl restart docker
+
+			INSTALL_URL_ADDRESS='https://raw.githubusercontent.com/TheAppgineer/roon-extension-manager/v1.x/rem-setup.sh'
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
 			G_EXEC curl -sSfLO "$INSTALL_URL_ADDRESS"
-			G_EXEC chmod +x setup.sh
-			G_EXEC_OUTPUT=1 G_EXEC ./setup.sh
-			G_EXEC_NOHALT=1 G_EXEC rm setup.sh
+			G_EXEC chmod +x rem-setup.sh
+			G_EXEC_OUTPUT=1 G_EXEC ./rem-setup.sh
+			G_EXEC_NOHALT=1 G_EXEC rm rem-setup.sh
 
 		fi
 
@@ -15300,12 +15306,12 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			UNINSTALL_URL_ADDRESS='https://raw.githubusercontent.com/TheAppgineer/roon-extension-manager-packaging/master/linux/setup.sh'
+			UNINSTALL_URL_ADDRESS='https://raw.githubusercontent.com/TheAppgineer/roon-extension-manager/v1.x/rem-setup.sh'
 			G_CHECK_URL "$UNINSTALL_URL_ADDRESS"
-			G_EXEC curl -sSfL "$UNINSTALL_URL_ADDRESS" -o setup.sh
-			G_EXEC chmod +x setup.sh
-			G_EXEC_OUTPUT=1 G_EXEC ./setup.sh --uninstall
-			G_EXEC_NOHALT=1 G_EXEC rm setup.sh
+			G_EXEC curl -sSfL "$UNINSTALL_URL_ADDRESS" -o rem-setup.sh
+			G_EXEC chmod +x rem-setup.sh
+			G_EXEC_OUTPUT=1 G_EXEC ./rem-setup.sh --uninstall
+			G_EXEC_NOHALT=1 G_EXEC rm rem-setup.sh
 
 		fi