From 31628cb3095e3f347fedfd8ecc6a6aa17a2cf4f1 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Fri, 31 Jul 2020 20:53:11 +0000
Subject: [PATCH] Load params at startup

---
 wireguard-install.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index 2eec4ec..5f3f8bb 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -215,10 +215,6 @@ net.ipv6.conf.all.forwarding = 1" >/etc/sysctl.d/wg.conf
 }
 
 function newClient() {
-	# Load params
-	# shellcheck disable=SC1091
-	source /etc/wireguard/params
-
 	ENDPOINT="${SERVER_PUB_IP}:${SERVER_PORT}"
 
 	echo ""
@@ -310,9 +306,6 @@ AllowedIPs = ${CLIENT_WG_IPV4}/32,${CLIENT_WG_IPV6}/128" >>"/etc/wireguard/${SER
 }
 
 function revokeClient() {
-	# Load params
-	source /etc/wireguard/params
-
 	NUMBER_OF_CLIENTS=$(grep -c -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf")
 	if [[ ${NUMBER_OF_CLIENTS} == '0' ]]; then
 		echo ""
@@ -345,13 +338,7 @@ function revokeClient() {
 }
 
 function uninstallWg() {
-	if [[ ! -e /etc/wireguard/params ]]; then
-		echo "WireGuard is not installed."
-		exit 1
-	fi
-
 	checkOS
-	source /etc/wireguard/params
 
 	systemctl stop "wg-quick@${SERVER_WG_NIC}"
 	systemctl disable "wg-quick@${SERVER_WG_NIC}"
@@ -428,8 +415,10 @@ function manageMenu() {
 # Check for root, virt, OS...
 initialCheck
 
-# Check if WireGuard is already installed
+# Check if WireGuard is already installed and load params
 if [[ -e /etc/wireguard/params ]]; then
+	# shellcheck disable=SC1091
+	source /etc/wireguard/params
 	manageMenu
 else
 	installWireGuard