From b798f1166e7a0a5ca04a6a42306c7a7f8d8eee0d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 16 Jun 2022 19:16:53 -0500 Subject: [PATCH] Update run.sh --- run.sh | 102 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/run.sh b/run.sh index 2cbf8de..1c74dd0 100755 --- a/run.sh +++ b/run.sh @@ -1,58 +1,70 @@ #!/usr/bin/env bash # MediaManager Loader -source /opt/idssys/defaults/colors.inc -source /opt/idssys/defaults/default.inc -source /opt/idssys/settings/mediamanager.conf +if [ ! -f /opt/mm.checking ]; then + touch /opt/mm.checking -noheader=' check ' + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc + source /opt/idssys/settings/mediamanager.conf -if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then - # if [ "${1}" = "gui" ]; then - # DISP_HEADER - # fi - if curl -m 3 -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 + noheader=' check ' + + if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then + # if [ "${1}" = "gui" ]; then + # DISP_HEADER + # fi + if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then if [ "${2}" != "q" ]; then - echo -en "\e[1A"; - echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}" + echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" + echo "" 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]}" + 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 - 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 + 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[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]}" + echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}" + fi 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/mm.checking fi -/opt/idssys/mediamanager/mm-scripts.sh ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} + exit 0 + + + + + +