voltron/mediamanager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
David Schroeder
2023-04-27 21:59:09 -05:00
parent a8532eec42 134480edfa
commit 9f6762c9cf
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='3.8.142-04232023' VERS='3.8.145-04232023'
MMFOLDER="/opt/idssys/mediamanager" MMFOLDER="/opt/idssys/mediamanager"
MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)

7
run.sh
View File

@@ -47,15 +47,16 @@ if [ "${1}" == "update" ]; then
fi fi
cd ${MMFOLDER} 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 if [ "${2}" != "q" ]; then
echo -en "\e[1A"; echo -en "\e[1A";
echo -e "\e[0K\r ${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" echo -e "\e[0K\r ${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}"
else else
echo -e "${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}"
fi fi
git fetch origin master >/dev/null 2>&1 git fetch origin ${gb} >/dev/null 2>&1
git reset --hard origin/master >/dev/null 2>&1 git reset --hard origin/${gb} >/dev/null 2>&1
git reflog expire --expire=now --all >/dev/null 2>&1 git reflog expire --expire=now --all >/dev/null 2>&1
git repack -ad >/dev/null 2>&1 git repack -ad >/dev/null 2>&1
git prune >/dev/null 2>&1 git prune >/dev/null 2>&1