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

update

Browse Source
This commit is contained in:
David Schroeder
2024-09-30 20:36:28 -05:00
parent 99d8fbdddc
commit c3cb143c11
3 changed files with 23 additions and 22 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.10.1-09302024' VERS='3.10.2-09302024'
MMFOLDER="/opt/idssys/mediamanager" MMFOLDER="/opt/idssys/mediamanager"
TMPFOLDER="${MMFOLDER}/.tmp" TMPFOLDER="${MMFOLDER}/.tmp"

37
mm-scripts.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# MediaManager Scripts # Media/VPN Manager Scripts
action="$1" action="$1"
@@ -29,7 +29,7 @@ if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] || ([
dispup="" dispup=""
fi fi
echo echo
echo -e "${idsCL[LightGreen]} MediaManager ${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${dispup}${idsCL[Default]}" echo -e "${idsCL[LightGreen]} Media/VPN Manager ${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${dispup}${idsCL[Default]}"
DIVIDER . lightGreen DIVIDER . lightGreen
fi fi
@@ -763,27 +763,28 @@ MMSTATUS(){
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
echo -e "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Green]}${mmip}${idsCL[Default]}" echo -e "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Green]}${mmip}${idsCL[Default]}"
### CHECK FOR PLEX MOUNT if [ ! -f ${MMFOLDER}/mm.noservicdes ]; then
echo ### CHECK FOR PLEX MOUNT
msg=" Verifying Plex Media Mount" echo
c=0; spc=''; spc1=$((${cw_spc}-${#msg})) msg=" Verifying Plex Media Mount"
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}" until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
echo -en "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Default]}"
if [ -f ${TMPFOLDER}/mm.plexmount.fail2 ]; then if [ -f ${TMPFOLDER}/mm.plexmount.fail2 ]; then
echo -e "${idsCL[Red]}Not Mounted${idsCL[LightCyan]}, running services as chosen previously${idsCL[Default]}" echo -e "${idsCL[Red]}Not Mounted${idsCL[LightCyan]}, running services as chosen previously${idsCL[Default]}"
elif [ ! -f ${PLEX_MOUNT}/mounted ]; then elif [ ! -f ${PLEX_MOUNT}/mounted ]; then
echo -e "${idsCL[Red]}Not Mounted${idsCL[Default]}" echo -e "${idsCL[Red]}Not Mounted${idsCL[Default]}"
else else
echo -e "${idsCL[Green]}Mounted${idsCL[Default]}" echo -e "${idsCL[Green]}Mounted${idsCL[Default]}"
rm -f ${TMPFOLDER}/mm.plexmount.fail* rm -f ${TMPFOLDER}/mm.plexmount.fail*
fi
echo
fi fi
echo
fi fi
fi fi

6
run.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# MediaManager Loader # Media/VPN Manager Loader
source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/colors.inc
source /opt/idssys/defaults/default.inc source /opt/idssys/defaults/default.inc
@@ -47,9 +47,9 @@ if ([ "${1}" == "update" ] && [ -z ${2+x} ]) || [ "${1}" == "setup" ] || [ "${1}
if [ "`git log --pretty=%H ...refs/heads/${GBRANCH}^ | head -n 1`" != "`git ls-remote origin -h refs/heads/${GBRANCH} |cut -f1`" ]; then if [ "`git log --pretty=%H ...refs/heads/${GBRANCH}^ | head -n 1`" != "`git ls-remote origin -h refs/heads/${GBRANCH} |cut -f1`" ]; then
if [ "${2}" != "q" ]; then if [ "${2}" != "q" ]; then
echo -en "\e[1A"; echo -en "\e[1A";
echo -e "${idsCL[LightCyan]}Updating MediaManager...${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Updating Media/VPN Manager...${idsCL[Default]}"
else else
echo -e "${idsCL[LightCyan]}Updating MediaManager...${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Updating Media/VPN Manager...${idsCL[Default]}"
fi fi
git fetch origin ${GBRANCH} >/dev/null 2>&1 git fetch origin ${GBRANCH} >/dev/null 2>&1
git reset --hard origin/${GBRANCH} >/dev/null 2>&1 git reset --hard origin/${GBRANCH} >/dev/null 2>&1