From 36e67d4de5b640fbe0d5decbcc7c900dad9bdb8e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:46:28 -0500 Subject: [PATCH 1/7] Update defaults.inc --- defaults.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.inc b/defaults.inc index 97f66fa..f30f779 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.142-04232023' +VERS='3.8.143-04232023' MMFOLDER="/opt/idssys/mediamanager" MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) From 6f57249ed8344abb23273ffdc8b7a477d0a7c468 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:46:54 -0500 Subject: [PATCH 2/7] Update run.sh --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 432fb8c..67a46db 100755 --- a/run.sh +++ b/run.sh @@ -47,7 +47,7 @@ if [ "${1}" == "update" ]; then fi cd ${MMFOLDER} - if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then + if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then if [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" From 02d5fabe6839bbf95c68bcb9a52374886edd7275 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:49:51 -0500 Subject: [PATCH 3/7] Update run.sh --- run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 67a46db..4c57426 100755 --- a/run.sh +++ b/run.sh @@ -47,7 +47,8 @@ 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]}" From 1811b419f47402c625123f5f0e5f70bad9b630d3 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:50:04 -0500 Subject: [PATCH 4/7] Update defaults.inc --- defaults.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.inc b/defaults.inc index f30f779..f4ddebe 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.143-04232023' +VERS='3.8.144-04232023' MMFOLDER="/opt/idssys/mediamanager" MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) From ae6d85a2e8f7ac69ebef2f5e120fe5b65fcdda81 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:50:59 -0500 Subject: [PATCH 5/7] Update run.sh --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 4c57426..404caa9 100755 --- a/run.sh +++ b/run.sh @@ -47,7 +47,7 @@ if [ "${1}" == "update" ]; then fi cd ${MMFOLDER} - [ "${GITBRANCH}" != "" ] && gb=${GITBRANCH} || gb="master" + [ "${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"; From 482a31800cc9a62ced936bc03dd7d9787928c105 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:51:34 -0500 Subject: [PATCH 6/7] Update run.sh --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 404caa9..968ec45 100755 --- a/run.sh +++ b/run.sh @@ -55,8 +55,8 @@ if [ "${1}" == "update" ]; then 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 From 134480edfa958c6a277c9f766231215b33487cc6 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 21:54:11 -0500 Subject: [PATCH 7/7] Update defaults.inc --- defaults.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.inc b/defaults.inc index f4ddebe..a3dce5f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.144-04232023' +VERS='3.8.145-04232023' MMFOLDER="/opt/idssys/mediamanager" MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)