diff --git a/defaults.inc b/defaults.inc index 97f66fa..a3dce5f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.142-04232023' +VERS='3.8.145-04232023' MMFOLDER="/opt/idssys/mediamanager" MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) diff --git a/run.sh b/run.sh index 67a46db..968ec45 100755 --- a/run.sh +++ b/run.sh @@ -47,15 +47,16 @@ if [ "${1}" == "update" ]; then fi cd ${MMFOLDER} - if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then + [ "${GITBRANCH}" != "" ] && gb="${GITBRANCH}" || gb="master" + if [ "`git log --pretty=%H ...refs/heads/${gb}^ | head -n 1`" != "`git ls-remote origin -h refs/heads/${gb} |cut -f1`" ]; then if [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" else echo -e "${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" fi - git fetch origin master >/dev/null 2>&1 - git reset --hard origin/master >/dev/null 2>&1 + git fetch origin ${gb} >/dev/null 2>&1 + git reset --hard origin/${gb} >/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