From 8b6cfed43b57c88b5ffb1d9a3531ce57de1f4e99 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 21 May 2023 08:26:23 -0500
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index 600b0ee..bd69336 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -100,7 +100,7 @@ MMSTART(){
 			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]}"
-			VPNCONFIG
+			VPNCONFIG_TORGUARD
 			echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 			
 			msg="Starting the VPN Tunnel"
@@ -740,25 +740,25 @@ GETVPNINFO(){
 
 }
 
-VPNCONFIG(){
-			privkey=$(/usr/bin/wg genkey)
-			reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey)
-			reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
-			
-			rm -f ${TMPFOLDER}/vpninfo
-			JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${reqpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk)			
-			echo -e "vpn_publickey=\"$(echo ${JSON} | jq -r '.server_public_key')\"
-vpn_server_ipv4=\"$(echo ${JSON} | jq -r '.server_ipv4')\"
-vpn_client_ipv4=\"$(echo ${JSON} | jq -r '.client_ipv4')\"
-vpn_routes=\"$(echo ${JSON} | jq -r '.routes')\"
-vpn_server_address=\"$(echo ${JSON} | jq -r '.vpn_server_address')\"
-vpn_server_port=\"$(echo ${JSON} | jq -r '.vpn_server_port')\"
-" > ${TMPFOLDER}/vpninfo
-			source ${TMPFOLDER}/vpninfo
+VPNCONFIG_TORGUARD(){
+	privkey=$(/usr/bin/wg genkey)
+	reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey)
+	reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
 
-			rm -f /etc/wireguard/${VPN_INTERFACE}.conf
+	rm -f ${TMPFOLDER}/vpninfo
+	JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${reqpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk)			
+	echo -e "vpn_publickey=\"$(echo ${JSON} | jq -r '.server_public_key')\"
+	vpn_server_ipv4=\"$(echo ${JSON} | jq -r '.server_ipv4')\"
+	vpn_client_ipv4=\"$(echo ${JSON} | jq -r '.client_ipv4')\"
+	vpn_routes=\"$(echo ${JSON} | jq -r '.routes')\"
+	vpn_server_address=\"$(echo ${JSON} | jq -r '.vpn_server_address')\"
+	vpn_server_port=\"$(echo ${JSON} | jq -r '.vpn_server_port')\"
+	" > ${TMPFOLDER}/vpninfo
+	source ${TMPFOLDER}/vpninfo
 
-			echo -e "[Interface]
+	rm -f /etc/wireguard/${VPN_INTERFACE}.conf
+
+	echo -e "[Interface]
 PrivateKey = ${privkey}
 ListenPort = 55009
 MTU = 1390
@@ -797,7 +797,7 @@ VPNSPEEDTEST(){
 	echo
 		
 	echo -en "${idsCL[LightCyan]}Starting vpn ... ${idsCL[Default]}"
-	# VPNCONFIG
+	# VPNCONFIG_TORGUARD
 	# "${VPN_START[@]}" >/dev/null 2>&1
 	mm start vpn >/dev/null 2>&1
 	echo -e "${idsCL[Green]}Done${idsCL[Default]}"