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 18:06:07 -05:00
parent 14755f79c9
commit c94c7a1b41
2 changed files with 65 additions and 61 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
VERS='3.9.85-09302024'
VERS='3.9.86-09302024'
MMFOLDER="/opt/idssys/mediamanager"
TMPFOLDER="${MMFOLDER}/.tmp"

26
mm-scripts.sh
View File

@@ -334,15 +334,16 @@ MMSTART(){
exit 1
fi
[ "${1}" == "start" ] && [ "${2}" != "vpn" ] && rm -f ${TMPFOLDER}/mm.noservices
if [ ${SERVICESCHECK} != "" ]; then
msg="Verifying Plex Media is Mounted"
c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}"
[ "${1}" == "start" ] && [ "${2}" != "vpn" ] && rm -f ${TMPFOLDER}/mm.noservices
### CHECK FOR PLEX MOUNT
if [ ! -f ${PLEX_MOUNT}/mounted ] && [ "${2}" != "vpn" ] && [ ! -f ${TMPFOLDER}/mm.noservices ]; then
if [ ! -f ${PLEX_MOUNT}/mounted ] && [ "${2}" != "vpn" ] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! -f ${MMFOLDER}/mm.noservices ]; then
echo "$(date) - Plex Media Not Mounted, will try and mount" >> ${MM_LOGFILE}
umount ${PLEX_MOUNT} >/dev/null 2>&1
sleep 2s
@@ -397,8 +398,11 @@ MMSTART(){
rm -f ${TMPFOLDER}/mm.plexmount.fail*
fi
fi
else
echo -e "${idsCL[LightCyan]}Skipping, started wtih VPN only${idsCL[Default]}"
fi
if [ -f ${TMPFOLDER}/mm.plexmount.fail ] && [ "${1}" == "start" ] && [ "${2}" != "vpn" ]; then
if [ -f ${TMPFOLDER}/mm.plexmount.fail ] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! -f ${MMFOLDER}/mm.noservices ] && [ "${1}" == "start" ] && [ "${2}" != "vpn" ]; then
echo -en "${idsCL[LightCyan]}Would you like to start services without Plex Media being mounted? ${idsCL[LightYellow]}(y/N)${idsCL[LightCyan]}? ${idsCL[Default]}"
read -n 1 choice
case "$choice" in
@@ -417,7 +421,7 @@ MMSTART(){
msg="${mmsv} Services"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}"
if [ "${2}" != "vpn" ] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! -f ${TMPFOLDER}/mm.plexmount.fail ]; then
if [ "${2}" != "vpn" ] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! -f ${MMFOLDER}/mm.noservices ] && [ ! -f ${TMPFOLDER}/mm.plexmount.fail ]; then
for srvc in "${SERVICES_CHECK[@]}"; do
[ "$(systemctl is-active ${srvc})" != "active" ] && /bin/systemctl restart ${srvc}
done
@@ -475,7 +479,7 @@ MMSTART(){
done
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
elif [ -f ${TMPFOLDER}/mm.noservices ]; then
elif [ -f ${TMPFOLDER}/mm.noservices ] || [ -f ${MMFOLDER}/mm.noservices ]; then
echo -e "${idsCL[LightCyan]}Skipping, started wtih VPN only${idsCL[Default]}"
elif [ -f ${TMPFOLDER}/mm.plexmount.fail ]; then
echo -e "${idsCL[LightCyan]}Skipping, plex media is not mounted${idsCL[Default]}"
@@ -588,8 +592,8 @@ MMSTOP(){
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
rm -f ${TMPFOLDER}/vpninfo*
rm -f ${TMPFOLDER}/realwanip
rm -f ${TMPFOLDER}/mm.noservices*
rm -f ${ TMPFOLDER}/realwanip
if [ ! -f ${MMFOLDER}/mm.noservices ] rm -f ${TMPFOLDER}/mm.noservices*
rm -f ${TMPFOLDER}/mm.plexmount.fail*
rm -f ${TMPFOLDER}/mm.stop.checking
@@ -623,7 +627,7 @@ MMSTATUS(){
echo -en " ${idsCL[White]}${dispname}${spc}${idsCL[White]}: ${idsCL[Default]}"
if [ "$(systemctl is-active ${srvc})" != "active" ] && [ "${srvc}" != "wireguard" ]; then
if [ -f ${TMPFOLDER}/mm.noservices ]; then
if [ -f ${TMPFOLDER}/mm.noservices ] || [ -f ${MMFOLDER}/mm.noservices ]; then
echo -e "${idsCL[LightCyan]}Skipping, started wtih VPN only${idsCL[Default]}"
elif [ -f ${TMPFOLDER}/mm.plexmount.fail ]; then
echo -e "${idsCL[LightCyan]}Skipping, Plex Media not mounted${idsCL[Default]}"
@@ -1194,7 +1198,7 @@ SERVICEBACKUPSTART(){
msg="Starting Service"; 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[Default]}"
OUT=$(ip link | grep "$VPN_INTERFACE") >/dev/null 2>&1
if [ ! -f ${TMPFOLDER}/mm.stop ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${usrvc} " ]] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! `find /opt/idssys/mediamanager/ -name 'mm.plexmount.fail*'` ]; then
if [ ! -f ${TMPFOLDER}/mm.stop ] && [[ " ${SERVICES_CHECK[*]} " =~ " ${usrvc} " ]] && [ ! -f ${TMPFOLDER}/mm.noservices ] && [ ! -f ${MMFOLDER}/mm.noservices ] && [ ! `find /opt/idssys/mediamanager/ -name 'mm.plexmount.fail*'` ]; then
/bin/systemctl disable ${usrvc} >> ${LOGFOLDER}/update.${usrvc}
/bin/systemctl start ${usrvc} >> ${LOGFOLDER}/update.${usrvc}
[ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${LOGFOLDER}/update.${usrvc}
@@ -1773,7 +1777,7 @@ if [ ! -f ${TMPFOLDER}/mm.update.stop ]; then
echo
exit 1
fi
[ -f ${TMPFOLDER}/mm.noservices ] && rv="vpn" || rv=""
([ -f ${TMPFOLDER}/mm.noservices ] || [ -f ${MMFOLDER}/mm.noservices ]) && rv="vpn" || rv=""
MMSTOP
echo -en "${idsCL[LightCyan]}Pausing for 30s to ensure a new VPN WAN IP, or press any key to continue with potentially getting a new address ... ${idsCL[Default]}"
read -et 30 -n 1