diff --git a/defaults.inc b/defaults.inc index 1a128f8..15a87e2 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.10.1-09302024' +VERS='3.10.2-09302024' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" diff --git a/mm-scripts.sh b/mm-scripts.sh index ac5ad46..84c433a 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# MediaManager Scripts +# Media/VPN Manager Scripts action="$1" @@ -29,7 +29,7 @@ if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] || ([ dispup="" fi 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 fi @@ -763,27 +763,28 @@ MMSTATUS(){ until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -e "${idsCL[White]}${msg}${spc}${idsCL[White]} : ${idsCL[Green]}${mmip}${idsCL[Default]}" - ### CHECK FOR PLEX MOUNT - echo - msg=" Verifying Plex Media Mount" - 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[White]} : ${idsCL[Default]}" + if [ ! -f ${MMFOLDER}/mm.noservicdes ]; then + ### CHECK FOR PLEX MOUNT + echo + msg=" Verifying Plex Media Mount" + 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[White]} : ${idsCL[Default]}" - if [ -f ${TMPFOLDER}/mm.plexmount.fail2 ]; then - echo -e "${idsCL[Red]}Not Mounted${idsCL[LightCyan]}, running services as chosen previously${idsCL[Default]}" + if [ -f ${TMPFOLDER}/mm.plexmount.fail2 ]; then + echo -e "${idsCL[Red]}Not Mounted${idsCL[LightCyan]}, running services as chosen previously${idsCL[Default]}" - elif [ ! -f ${PLEX_MOUNT}/mounted ]; then - echo -e "${idsCL[Red]}Not Mounted${idsCL[Default]}" + elif [ ! -f ${PLEX_MOUNT}/mounted ]; then + echo -e "${idsCL[Red]}Not Mounted${idsCL[Default]}" - else - echo -e "${idsCL[Green]}Mounted${idsCL[Default]}" - rm -f ${TMPFOLDER}/mm.plexmount.fail* + else + echo -e "${idsCL[Green]}Mounted${idsCL[Default]}" + rm -f ${TMPFOLDER}/mm.plexmount.fail* + fi + + echo fi - echo - - fi fi diff --git a/run.sh b/run.sh index e2ed67a..5c0ddee 100755 --- a/run.sh +++ b/run.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# MediaManager Loader +# Media/VPN Manager Loader source /opt/idssys/defaults/colors.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 [ "${2}" != "q" ]; then echo -en "\e[1A"; - echo -e "${idsCL[LightCyan]}Updating MediaManager...${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Updating Media/VPN Manager...${idsCL[Default]}" else - echo -e "${idsCL[LightCyan]}Updating MediaManager...${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Updating Media/VPN Manager...${idsCL[Default]}" fi git fetch origin ${GBRANCH} >/dev/null 2>&1 git reset --hard origin/${GBRANCH} >/dev/null 2>&1