From 8dd5386c2fa7825aba0802ccd12c3c220ddb9c80 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 25 Mar 2023 10:41:30 -0500 Subject: [PATCH] Update mm-scripts.sh --- mm-scripts.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm-scripts.sh b/mm-scripts.sh index 62c4264..b2f7263 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -97,7 +97,7 @@ AllowedIPs = 0.0.0.0/0 Endpoint = ${vpn_server_address}:${vpn_server_port} PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" msg="Starting the VPN Tunnel" @@ -155,7 +155,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf else if [ ${GOFORSTART} = true ] || [ "${1}" == "check" ]; then - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" fi zerogw=$(/sbin/ip route show | grep 0.0.0.0 | cut -d' ' -f 3) @@ -177,7 +177,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf /bin/ip route add 128.0.0.0/1 dev ${VPN_INTERFACE} /bin/ip route add ${vpn_server_address}/32 via 10.10.0.1 dev eth0 - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" zerogw=$(/sbin/ip route show | grep 0.0.0.0 | cut -d' ' -f 3) defaultgw=$(/sbin/ip route show | grep default | cut -d' ' -f 3) @@ -212,7 +212,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf zerogw=$(/sbin/ip route show | grep 0.0.0.0 | cut -d' ' -f 3) defaultgw=$(/sbin/ip route show | grep default | cut -d' ' -f 3) done - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" msg="Verifying traffic routing through VPN" c=0; spc=''; spc1=$((${cw_spc}-${#msg})) @@ -245,7 +245,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf sleep 1s done if [ "${scip}" != "${mmip}" ]; then - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" [ $VERBOSE = true ] && echo "$(date) - WAN Address: ${mmip} - GW Address: ${defaultgw}" >> $logfile else echo @@ -325,7 +325,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf /bin/systemctl start ${srvc} done - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" else echo -e "${idsCL[LightYellow]}Skipping ${mmsv} Services ${idsCL[Default]}" @@ -371,7 +371,7 @@ MMSTOP(){ # for i in $getMMbash; do # /bin/kill $i # done - # echo -e "${idsCL[Green]} done${idsCL[Default]}" + # echo -e "${idsCL[Green]}Done${idsCL[Default]}" msg="Stopping Services" c=0; spc=''; spc1=$((${cw_spc}-${#msg})) @@ -410,7 +410,7 @@ MMSTOP(){ # fi #/radarr # fi #/ombi done - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" msg="Shutting Down VPN Tunnel" c=0; spc=''; spc1=$((${cw_spc}-${#msg})) @@ -428,7 +428,7 @@ MMSTOP(){ fi done - echo -e "${idsCL[Green]}done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" msg="Re-Adding Default Network Routes" c=0; spc=''; spc1=$((${cw_spc}-${#msg})) @@ -438,7 +438,7 @@ MMSTOP(){ [ "$(/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]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}" rm -f ${MMFOLDER}/vpninfo* rm -f ${MMFOLDER}/mm.noservices*