From b7ced7f6c1487f3bfbd639009d94b869ebfbfee0 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 29 Apr 2023 20:13:27 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- mm-scripts.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/defaults.inc b/defaults.inc index 4eb3462..769ab35 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.157-04232023' +VERS='3.8.161-04232023' MMFOLDER="/opt/idssys/mediamanager" MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) diff --git a/mm-scripts.sh b/mm-scripts.sh index 3f77c39..3bc7cd4 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -815,11 +815,10 @@ UPDATESERVICE(){ DIVIDER . lightGreen echo ${usrvc} if [ "${usrvc}" == "organizr" ]; then - msg="Updating Organizr Web UI Interface"; 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]}" - cd /var/www/media.scity.us/html >/dev/null 2>&1 if [ "`git log --pretty=%H ...refs/heads/v2-master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/v2-master |cut -f1`" ]; then + msg="Updating Organizr Web UI Interface"; 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]}" /usr/bin/git stash >/dev/null 2>&1 /usr/bin/git pull >/dev/null 2>&1 /bin/chown -Rf www-data:www-data /var/www/media.scity.us/html @@ -830,7 +829,7 @@ UPDATESERVICE(){ /bin/systemctl restart nginx >/dev/null 2>&1 echo -e "${idsCL[Green]}Done${idsCL[Default]}" else - echo -e "${idsCL[LightCyan]}Update not needed${idsCL[Default]}" + echo -e " ${idsCL[LightCyan]} Update Not Needed ${idsCL[Default]}" fi echo "$(date) - Updated Organizr" >> $logfile