diff --git a/mm-scripts.sh b/mm-scripts.sh index df75c5f..cbc3399 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -25,16 +25,11 @@ unset IFS MMSTART(){ if [ "${action}" = "start" ]; then mmsv='Starting' - echo -e "${idsCL[Green]}Starting System... ${idsCL[Default]}" + echo -e "${idsCL[Green]}Starting the VPN Tunnel ... ${idsCL[Default]}" "${VPN_START[@]}" - elif [ "${action}" = "stop" ]; then - mmsv='Stopping' - echo -e "${idsCL[Green]}Stopping System... ${idsCL[Default]}" else mmsv='Verifying' fi - echo - echo -en "${idsCL[LightCyan]}${mmsv} VPN Tunnel... ${idsCL[Default]}" checked=false cc=0 @@ -96,20 +91,15 @@ MMSTART(){ } MMSTOP(){ - if [ "${action}" = "start" ]; then - mmsv='Starting' - echo -e "${idsCL[Green]}Starting System...${idsCL[Default]}" - elif [ "${action}" = "stop" ]; then - mmsv='Stopping' - if [ -f /opt/mm.stop ]; then - echo -e "${idsCL[Yellow]}The system is already stopped, will verify anyway,..${idsCL[Default]}" - else - echo -e "${idsCL[Green]}Stopping System...${idsCL[Default]}" - fi + if [ -f /opt/mm.stop ]; then + echo -e "${idsCL[Yellow]}The system is already stopped, will verify anyway,..${idsCL[Default]}" + else + echo -e "${idsCL[Green]}Stopping System...${idsCL[Default]}" echo fi + echo touch /opt/mm.stop - echo -en "${idsCL[LightCyan]}${mmsv} Services... ${idsCL[Default]}" + echo -en "${idsCL[LightCyan]}Stopping Services... ${idsCL[Default]}" for srvc in "${SERVICES_CHECK[@]}"; do /bin/systemctl stop ${srvc} & done @@ -125,7 +115,7 @@ MMSTOP(){ done echo -e "${idsCL[Green]} done${idsCL[Default]}" echo - echo -en "${idsCL[LightCyan]}${mmsv} VPN Tunnel... ${idsCL[Default]}" + echo -en "${idsCL[LightCyan]}Stopping VPN Tunnel... ${idsCL[Default]}" "${VPN_STOP[@]}" echo -e "${idsCL[Green]} done${idsCL[Default]}" echo