From c4514675e613023acc16950a17c29da83aee873a Mon Sep 17 00:00:00 2001
From: Dolorosus <github@dolorosus.de>
Date: Mon, 5 Jun 2023 13:16:53 +0200
Subject: [PATCH] Unique identification of client names in pivp -on/-off

---
 scripts/wireguard/disableCONF.sh | 6 +++---
 scripts/wireguard/enableCONF.sh  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/wireguard/disableCONF.sh b/scripts/wireguard/disableCONF.sh
index 901256c..f2112cd 100755
--- a/scripts/wireguard/disableCONF.sh
+++ b/scripts/wireguard/disableCONF.sh
@@ -97,7 +97,7 @@ for CLIENT_NAME in "${CLIENTS_TO_CHANGE[@]}"; do
 
   if ! grep -q "^${CLIENT_NAME} " configs/clients.txt; then
     echo -e "::: \e[1m${CLIENT_NAME}\e[0m does not exist"
-  elif grep -q "#\[disabled\] ### begin ${CLIENT_NAME}" wg0.conf; then
+  elif grep -q "#\[disabled\] ### begin ${CLIENT_NAME} ###" wg0.conf; then
     echo -e "::: \e[1m${CLIENT_NAME}\e[0m is already disabled"
   else
     if [[ -n "${CONFIRM}" ]]; then
@@ -110,8 +110,8 @@ for CLIENT_NAME in "${CLIENTS_TO_CHANGE[@]}"; do
       # Disable the peer section from the server config
       echo "${CLIENT_NAME}"
 
-      sed_pattern="/### begin ${CLIENT_NAME}/,"
-      sed_pattern="${sed_pattern}/end ${CLIENT_NAME}/ s/^/#\[disabled\] /"
+      sed_pattern="/### begin ${CLIENT_NAME} ###/,"
+      sed_pattern="${sed_pattern}/end ${CLIENT_NAME} ###/ s/^/#\[disabled\] /"
       sed -e "${sed_pattern}" -i wg0.conf
       unset sed_pattern
 
diff --git a/scripts/wireguard/enableCONF.sh b/scripts/wireguard/enableCONF.sh
index 390b0a9..d20276d 100755
--- a/scripts/wireguard/enableCONF.sh
+++ b/scripts/wireguard/enableCONF.sh
@@ -110,8 +110,8 @@ for CLIENT_NAME in "${CLIENTS_TO_CHANGE[@]}"; do
       # Enable the peer section from the server config
       echo "${CLIENT_NAME}"
 
-      sed_pattern="/begin ${CLIENT_NAME}/,"
-      sed_pattern="${sed_pattern}/end ${CLIENT_NAME}/ s/#\[disabled\] //"
+      sed_pattern="/### begin ${CLIENT_NAME} ###/,"
+      sed_pattern="${sed_pattern}/### end ${CLIENT_NAME} ###/ s/#\[disabled\] //"
       sed -e "${sed_pattern}" -i wg0.conf
       unset sed_pattern