From 997528efd3ea05682eee8f4f52c167a34c9ecca4 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 25 Feb 2023 16:52:00 -0600
Subject: [PATCH] Update run.sh

---
 run.sh | 119 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/run.sh b/run.sh
index e935369..bca0bfa 100755
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,64 @@
 # MediaManager Loader
 
 source /opt/idssys/defaults/colors.inc
+source /opt/idssys/defaults/default.inc
+source /opt/idssys/mediamanager/defaults.inc
+
+if [ -f /opt/idssys/settings/mediamanager.conf ]; then
+	source /opt/idssys/settings/mediamanager.conf
+else
+	source /opt/idssys/mediamanager/settings.conf
+fi
+
+if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
+	# if [ "${1}" = "gui" ]; then
+	# 	DISP_HEADER
+	# fi
+	if curl -m 15 -s --head  --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then 
+		if [ "${2}" != "q" ]; then
+			echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
+			echo ""
+		fi
+		cd /opt/idssys/defaults
+		if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
+			if [ "${2}" != "q" ]; then
+				echo -en "\e[1A";
+				echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}"
+			fi
+			git fetch origin master >/dev/null 2>&1
+			git reset --hard origin/master >/dev/null 2>&1
+			git reflog expire --expire=now --all >/dev/null 2>&1
+			git repack -ad >/dev/null 2>&1
+			git prune >/dev/null 2>&1
+			git pull >/dev/null 2>&1
+			git submodule update --remote >/dev/null 2>&1
+		fi
+		cd /opt/idssys/mediamanager
+		if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
+			if [ "${2}" != "q" ]; then
+				echo -en "\e[1A";
+				echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}"
+			fi
+			git fetch origin master >/dev/null 2>&1
+			git reset --hard origin/master >/dev/null 2>&1
+			git reflog expire --expire=now --all >/dev/null 2>&1
+			git repack -ad >/dev/null 2>&1
+			git prune >/dev/null 2>&1
+			git pull >/dev/null 2>&1
+			git submodule update --remote >/dev/null 2>&1
+			/bin/chmod +x /opt/idssys/mediamanager/mm-scripts.sh 2>&1
+			if [ "${2}" != "q" ]; then
+				echo -en "\e[1A";
+				echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
+			fi			
+		elif [ "${2}" != "q" ]; then
+			echo -en "\e[1A";
+			echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}"
+		fi
+	else
+		echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}"
+	fi
+fi
 
 if [ -f /opt/idssys/mediamanager/mm.checking ]; then
 	fd=$(( `date +%s` - `stat -L --format %Y /opt/idssys/mediamanager/mm.checking` ))
@@ -11,68 +69,11 @@ if [ -f /opt/idssys/mediamanager/mm.checking ]; then
 		echo -e "${idsCL[LightCyan]}Try again later, 'mm' program currently in use...${idsCL[Default]}"
 	fi
 fi
+
+
 if [ ! -f /opt/idssys/mediamanager/mm.checking ]; then
 	touch /opt/idssys/mediamanager/mm.checking
-
-	source /opt/idssys/defaults/default.inc
-	source /opt/idssys/mediamanager/defaults.inc
-	if [ -f /opt/idssys/settings/mediamanager.conf ]; then
-		source /opt/idssys/settings/mediamanager.conf
-	else
-		source /opt/idssys/mediamanager/settings.conf
-	fi
-
-	if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then
-		# if [ "${1}" = "gui" ]; then
-		# 	DISP_HEADER
-		# fi
-		if curl -m 15 -s --head  --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then 
-			if [ "${2}" != "q" ]; then
-				echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
-				echo ""
-			fi
-			cd /opt/idssys/defaults
-			if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
-				if [ "${2}" != "q" ]; then
-					echo -en "\e[1A";
-					echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}"
-				fi
-				git fetch origin master >/dev/null 2>&1
-				git reset --hard origin/master >/dev/null 2>&1
-				git reflog expire --expire=now --all >/dev/null 2>&1
-				git repack -ad >/dev/null 2>&1
-				git prune >/dev/null 2>&1
-				git pull >/dev/null 2>&1
-				git submodule update --remote >/dev/null 2>&1
-			fi
-			cd /opt/idssys/mediamanager
-			if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
-				if [ "${2}" != "q" ]; then
-					echo -en "\e[1A";
-					echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}"
-				fi
-				git fetch origin master >/dev/null 2>&1
-				git reset --hard origin/master >/dev/null 2>&1
-				git reflog expire --expire=now --all >/dev/null 2>&1
-				git repack -ad >/dev/null 2>&1
-				git prune >/dev/null 2>&1
-				git pull >/dev/null 2>&1
-				git submodule update --remote >/dev/null 2>&1
-				/bin/chmod +x /opt/idssys/mediamanager/mm-scripts.sh 2>&1
-				if [ "${2}" != "q" ]; then
-					echo -en "\e[1A";
-					echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}"
-				fi			
-			elif [ "${2}" != "q" ]; then
-				echo -en "\e[1A";
-				echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}"
-			fi
-		else
-			echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}"
-		fi
-	fi
 	/opt/idssys/mediamanager/mm-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}
-	rm -f /opt/idssys/mediamanager/mm.checking
 fi
 
 exit 0