diff --git a/mm-scripts.sh b/mm-scripts.sh index 911b6c7..9c7d72b 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -373,7 +373,11 @@ MMSTOP(){ # done # echo -e "${idsCL[Green]} done${idsCL[Default]}" - echo -en "${idsCL[LightCyan]}Stopping Services... ${idsCL[Default]}" + msg="Stopping 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[Default]}" + #for srvc in "${SERVICES_CHECK[@]}"; do for i in "${!NM_SERVICES[@]}"; do srvc=${NM_SERVICES[$i]} @@ -401,10 +405,14 @@ MMSTOP(){ fi #/radarr fi #/ombi done - echo -e "${idsCL[Green]} done${idsCL[Default]}" + echo -e "${idsCL[Green]}done${idsCL[Default]}" echo - echo -en "${idsCL[LightCyan]}Stopping VPN Tunnel... ${idsCL[Default]}" + msg="Shutting Down VPN Tunnel" + 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[Default]}" + "${VPN_STOP[@]}" >/dev/null 2>&1 checked=false @@ -416,14 +424,22 @@ MMSTOP(){ fi done + echo -e "${idsCL[Green]}done${idsCL[Default]}" + + msg="Adding default routes back in" + 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[Default]}" + [ "$(/sbin/ip route show | grep default | cut -d' ' -f 3)" != "10.10.0.1" ] && /bin/ip route add default via 10.10.0.1 && ip route del ${vpn_server_address} [ $VERBOSE = true ] && echo "$(date) - Added default route back in" >> $logfile + echo -e "${idsCL[Green]}done${idsCL[Default]}" + rm -f ${MMFOLDER}/vpninfo* rm -f ${MMFOLDER}/mm.noservices* rm -f ${MMFOLDER}/mm.stop.checking - echo -e "${idsCL[Green]} done${idsCL[Default]}" echo "$(date) - Media Management systems stopped" >> $logfile echo