diff --git a/mm-scripts.sh b/mm-scripts.sh index 233b795..6e50da0 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -65,7 +65,7 @@ MMSTART(){ msg="Setting up the VPN Tunnel config" 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]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" privkey=$(/usr/bin/wg genkey) reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey) @@ -113,7 +113,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf 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]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" [ $VERBOSE = true ] && echo "$(date) - ${mmsv} VPN..." >> $logfile @@ -169,7 +169,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf msg="Adding VPN default routes" 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]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" /bin/ip route del default /bin/ip route add default dev ${VPN_INTERFACE} @@ -186,7 +186,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf msg="Verifying default network routes" 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]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" checked=false cc=0 @@ -217,7 +217,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf msg="Verifying traffic routing through VPN" 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]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" scip="" mmip="" @@ -266,7 +266,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf 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[Default]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" ### CHECK FOR PLEX MOUNT files=$(shopt -s nullglob dotglob; echo ${PLEX_MOUNT}/*) @@ -319,7 +319,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf 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[Default]}" + echo -en "${idsCL[LightCyan]}${msg}${spc} : ${idsCL[Default]}" for srvc in "${SERVICES_CHECK[@]}"; do /bin/systemctl start ${srvc}