From 1c820fbfcbbde61294a6d47e87bbc695daf95bf3 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 29 Apr 2023 19:54:11 -0500
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 101 +++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index f987db7..203d8df 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -914,65 +914,66 @@ UPDATESERVICE(){
 				
 						rm -f ${tmpfile} &>/dev/null
 						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+						
+					else
+						# msg="Latest Version"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+						# echo -e "${idsCL[White]}${msg}${spc} : ${idsCL[Green]}${installed_ver}${idsCL[Default]}"
+						#
+						# cver=${usrvc}_VER
+						# msg="Current Version"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+						# echo -e "${idsCL[White]}${msg}${spc} : ${idsCL[Green]}${!cver}${idsCL[Default]}"
+						echo -e " ${idsCL[White]}Update Not Needed${idsCL[Green]}${installed_ver}${idsCL[Default]}"
+										
+					fi
 	
 				
-					elif [ "${MM_UPDATE_REPO[${usrvc}]}" == "systemd" ]; then
-				
-						msg="Installing version"
-						c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
-						until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-						echo -e "${idsCL[White]}${msg}${spc} : ${idsCL[Green]}${installed_ver}${idsCL[Default]}"
-				
-						msg="Updating service"
-						c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
-						until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-						echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}"
-				
-						installed_ver=`dpkg -s ${usrvc} | grep Version`
-						# /usr/bin/apt install ${usrvc} >/dev/null 2>&1
-						/bin/systemctl disable ${usrvc} >/dev/null 2>&1
-				
-						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-				
-					fi
+				elif [ "${MM_UPDATE_REPO[${usrvc}]}" == "systemd" ]; then
 			
-					[ ! -f ${MMFOLDER}/vers.info ] && touch ${MMFOLDER}/vers.info
-					/bin/sed -i /${usrvc}/d ${MMFOLDER}/vers.info
-					echo "${usrvc}_VER=\"${installed_ver}\"" >> ${MMFOLDER}/vers.info
+					msg="Installing version"
+					c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
+					until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+					echo -e "${idsCL[White]}${msg}${spc} : ${idsCL[Green]}${installed_ver}${idsCL[Default]}"
 			
-					msg="Starting service back up"
+					msg="Updating service"
 					c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
 					until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 					echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}"
-		
-					OUT=$(ip link | grep "$VPN_INTERFACE") >/dev/null 2>&1
-					if [[ " ${SERVICES_CHECK[*]} " =~ " ${usrvc} " ]] && [ ! -f ${MMFOLDER}/mm.noservices ] && [ ! `find /opt/idssys/mediamanager/ -name 'mm.plexmount.fail*'` ]; then
-						/bin/systemctl disable ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc}
-						/bin/systemctl start ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc}
-						[ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${MMFOLDER}/logs/update.${usrvc}
-						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-					else
-						echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}"
-					fi
-		
-					echo "$(date) - Updating Service (${usrvc}) : Completed" >> $logfile
-					echo -e "${idsCL[Green]}${usrvc^} Service has been updated${idsCL[Default]}"
-					
-				else
-					# msg="Latest Version"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-					# echo -e "${idsCL[White]}${msg}${spc} : ${idsCL[Green]}${installed_ver}${idsCL[Default]}"
-					#
-					# cver=${usrvc}_VER
-					# msg="Current Version"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-					# echo -e "${idsCL[White]}${msg}${spc} : ${idsCL[Green]}${!cver}${idsCL[Default]}"
-					echo -e " ${idsCL[White]}Update Not Needed${idsCL[Green]}${installed_ver}${idsCL[Default]}"
-					
+			
+					installed_ver=`dpkg -s ${usrvc} | grep Version`
+					# /usr/bin/apt install ${usrvc} >/dev/null 2>&1
+					/bin/systemctl disable ${usrvc} >/dev/null 2>&1
+			
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+			
 				fi
-			
-			else
-				echo -e "${idsCL[Red]}Not currently available to update${idsCL[Default]}"
-			
+		
+				[ ! -f ${MMFOLDER}/vers.info ] && touch ${MMFOLDER}/vers.info
+				/bin/sed -i /${usrvc}/d ${MMFOLDER}/vers.info
+				echo "${usrvc}_VER=\"${installed_ver}\"" >> ${MMFOLDER}/vers.info
+		
+				msg="Starting service back up"
+				c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
+				until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+				echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}"
+	
+				OUT=$(ip link | grep "$VPN_INTERFACE") >/dev/null 2>&1
+				if [[ " ${SERVICES_CHECK[*]} " =~ " ${usrvc} " ]] && [ ! -f ${MMFOLDER}/mm.noservices ] && [ ! `find /opt/idssys/mediamanager/ -name 'mm.plexmount.fail*'` ]; then
+					/bin/systemctl disable ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc}
+					/bin/systemctl start ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc}
+					[ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${MMFOLDER}/logs/update.${usrvc}
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+				else
+					echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}"
+				fi
+	
+				echo "$(date) - Updating Service (${usrvc}) : Completed" >> $logfile
+				echo -e "${idsCL[Green]}${usrvc^} Service has been updated${idsCL[Default]}"
+				
 			fi
+		
+		else
+			echo -e "${idsCL[Red]}Not currently available to update${idsCL[Default]}"
+		
 		fi
 		
 	else