From fce88a38c50ef0a1d41a5e8945df03b5fb212613 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sat, 22 Aug 2020 19:56:40 +0000
Subject: [PATCH 01/12] Add headless support

---
 wireguard-install.sh | 49 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index d450d99..5ccf81b 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -72,11 +72,16 @@ function installQuestions() {
 		# Detect public IPv6 address
 		SERVER_PUB_IP=$(ip -6 addr | sed -ne 's|^.* inet6 \([^/]*\)/.* scope global.*$|\1|p' | head -1)
 	fi
-	read -rp "IPv4 or IPv6 public address: " -e -i "${SERVER_PUB_IP}" SERVER_PUB_IP
+
+	APPROVE_IP=${APPROVE_IP:-n}
+	if [[ ${APPROVE_IP} =~ n ]]; then
+		read -rp "IPv4 or IPv6 public address: " -e -i "${SERVER_PUB_IP}" SERVER_PUB_IP
+	fi
 
 	# Detect public interface and pre-fill for the user
 	SERVER_NIC="$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)"
-	until [[ ${SERVER_PUB_NIC} =~ ^[a-zA-Z0-9_]+$ ]]; do
+	APPROVE_NIC=${APPROVE_NIC:-n}
+	until [[ ${SERVER_PUB_NIC} =~ ^[a-zA-Z0-9_]+$ || ${APPROVE_NIC} =~ n ]]; do
 		read -rp "Public interface: " -e -i "${SERVER_NIC}" SERVER_PUB_NIC
 	done
 
@@ -112,12 +117,34 @@ function installQuestions() {
 	echo ""
 	echo "Okay, that was all I needed. We are ready to setup your WireGuard server now."
 	echo "You will be able to generate a client at the end of the installation."
-	read -n1 -r -p "Press any key to continue..."
+	APPROVE_INSTALL=${APPROVE_INSTALL:-n}
+	if [[ $APPROVE_INSTALL =~ n ]]; then
+		read -n1 -r -p "Press any key to continue..."
+	fi
 }
 
 function installWireGuard() {
-	# Run setup questions first
-	installQuestions
+	if [[ ${AUTO_INSTALL} == "y" ]]; then
+		# Set default choices so that no questions will be asked.
+		APPROVE_INSTALL=${APPROVE_INSTALL:-y}
+		APPROVE_IP=${APPROVE_IP:-y}
+		APPROVE_NIC=${APPROVE_NIC:-y}
+		SERVER_WG_NIC=${SERVER_WG_NIC:-wg0}
+		SERVER_WG_IPV4=${SERVER_WG_IPV4:-10.66.66.1}
+		SERVER_WG_IPV6=${SERVER_WG_IPV6:-fd42:42:42::1}
+		SERVER_PORT=${SERVER_PORT:-$(shuf -i49152-65535 -n1)}
+		CLIENT_DNS_1=${CLIENT_DNS_1:-176.103.130.130}
+		CLIENT_DNS_2=${CLIENT_DNS_2:-176.103.130.131}
+		CLIENT_NAME=${CLIENT_NAME:-client}
+		CLIENT_DOT_IPV4=${CLIENT_DOT_IPV4:-2}
+		CLIENT_DOT_IPV6=${CLIENT_DOT_IPV6:-2}
+
+		# Behind NAT, we'll default to the publicly reachable IPv4.
+		SERVER_PUB_IP=${SERVER_PUB_IP:-$(curl https://ifconfig.co)}
+	else
+		# Run setup questions first
+		installQuestions
+	fi
 
 	# Install WireGuard tools and module
 	if [[ ${OS} == 'ubuntu' ]]; then
@@ -239,8 +266,10 @@ function newClient() {
 	fi
 
 	until [[ ${IPV4_EXISTS} == '0' ]]; do
-		read -rp "Client's WireGuard IPv4: ${SERVER_WG_IPV4::-1}" -e -i "${DOT_IP}" DOT_IP
-		CLIENT_WG_IPV4="${SERVER_WG_IPV4::-1}${DOT_IP}"
+		until [[ ${CLIENT_DOT_IPV4} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do
+			read -rp "Client's WireGuard IPv4: ${SERVER_WG_IPV4::-1}" -e -i "${CLIENT_DOT_IPV4}" CLIENT_DOT_IPV4
+		done
+		CLIENT_WG_IPV4="${SERVER_WG_IPV4::-1}${CLIENT_DOT_IPV4}"
 		IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4" "/etc/wireguard/${SERVER_WG_NIC}.conf")
 
 		if [[ ${IPV4_EXISTS} == '1' ]]; then
@@ -251,8 +280,10 @@ function newClient() {
 	done
 
 	until [[ ${IPV6_EXISTS} == '0' ]]; do
-		read -rp "Client's WireGuard IPv6: ${SERVER_WG_IPV6::-1}" -e -i "${DOT_IP}" DOT_IP
-		CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${DOT_IP}"
+		until [[ ${CLIENT_DOT_IPV6} =~ ^[a-f0-9]{1,4}$ ]]; do
+			read -rp "Client's WireGuard IPv6: ${SERVER_WG_IPV6::-1}" -e -i "${CLIENT_DOT_IPV6}" CLIENT_DOT_IPV6
+		done
+		CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT_IPV6}"
 		IPV6_EXISTS=$(grep -c "${CLIENT_WG_IPV6}" "/etc/wireguard/${SERVER_WG_NIC}.conf")
 
 		if [[ ${IPV6_EXISTS} == '1' ]]; then

From b94cc6360102d92180c37faf1cf93d962942d45a Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sat, 22 Aug 2020 20:01:53 +0000
Subject: [PATCH 02/12] Allow custom IP and NIC in headless mode

The default route shouldn't be forced
---
 wireguard-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index 5ccf81b..b5739a9 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -67,7 +67,7 @@ function installQuestions() {
 	echo ""
 
 	# Detect public IPv4 or IPv6 address and pre-fill for the user
-	SERVER_PUB_IP=$(ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$|\1|p' | head -1)
+	SERVER_PUB_IP=${SERVER_PUB_IP:-$(ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$|\1|p' | head -1)}
 	if [[ -z ${SERVER_PUB_IP} ]]; then
 		# Detect public IPv6 address
 		SERVER_PUB_IP=$(ip -6 addr | sed -ne 's|^.* inet6 \([^/]*\)/.* scope global.*$|\1|p' | head -1)
@@ -79,7 +79,7 @@ function installQuestions() {
 	fi
 
 	# Detect public interface and pre-fill for the user
-	SERVER_NIC="$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)"
+	SERVER_NIC=${SERVER_NIC:-$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)}
 	APPROVE_NIC=${APPROVE_NIC:-n}
 	until [[ ${SERVER_PUB_NIC} =~ ^[a-zA-Z0-9_]+$ || ${APPROVE_NIC} =~ n ]]; do
 		read -rp "Public interface: " -e -i "${SERVER_NIC}" SERVER_PUB_NIC

From 7d4c11d5079d755d26cbcf3e2a2284c2cfb93925 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sat, 22 Aug 2020 20:20:33 +0000
Subject: [PATCH 03/12] Add headless documentation

---
 README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/README.md b/README.md
index db67ebe..0cb8b5e 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,57 @@ It will install WireGuard (kernel module and tools) on the server, configure it,
 
 Run the script again to add or remove clients!
 
+## Headless install
+
+It's also possible to run the script headless, e.g. without waiting for user input, in an automated manner.
+
+Example usage:
+
+```bash
+AUTO_INSTALL=y ./wireguard-install.sh
+
+# or
+
+export AUTO_INSTALL=y
+./wireguard-install.sh
+```
+
+A default set of variables will then be set, by passing the need for user input.
+
+If you want to customise your installation, you can export them or specify them on the same line, as shown above.
+
+- `APPROVE_INSTALL=y`
+- `APPROVE_IP=y`
+- `APPROVE_NIC=y`
+- `SERVER_WG_NIC=wg0`
+- `SERVER_WG_IPV4=10.66.66.1`
+- `SERVER_WG_IPV6=fd42:42:42::1`
+- `SERVER_PORT=51820`
+- `CLIENT_DNS_1=176.103.130.130`
+- `CLIENT_DNS_2=176.103.130.131`
+- `CLIENT_NAME=client`
+- `CLIENT_DOT_IPV4=2`
+- `CLIENT_DOT_IPV6=2`
+
+If the server is behind NAT, you can specify its endpoint with the `SERVER_PUB_IP` variable. If the endpoint is the public IP address which it is behind, you can use `SERVER_PUB_IP=$(curl ifconfig.co)` (the script will default to this). The endpoint can be an IP or a domain.
+
+Other variables can be set depending on your choice (`SERVER_NIC`). You can search for them in the `installQuestions()` function of the script.
+
+## Headless User Addition
+
+It's also possible to automate the addition of a new user. Here, the key is to provide the (string) value of the `MENU_OPTION` variable along with the remaining mandatory variables before invoking the script.
+
+The following Bash script adds a new user `foo` to an existing WireGuard configuration
+
+```bash
+#!/bin/bash
+export MENU_OPTION="1"
+export CLIENT_NAME="foo"
+export CLIENT_DOT_IPV4="3"
+export CLIENT_DOT_IPV6="3"
+./wireguard-install.sh
+```
+
 ## Providers
 
 I recommend these cheap cloud providers for your VPN server:

From a193f5ad78165de70e86c81e600e84bb4a15fe78 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sat, 22 Aug 2020 20:26:21 +0000
Subject: [PATCH 04/12] Allow a default IPv6 NIC

Missed to commit in the refactor PR
---
 wireguard-install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index b5739a9..063a2ce 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -80,6 +80,9 @@ function installQuestions() {
 
 	# Detect public interface and pre-fill for the user
 	SERVER_NIC=${SERVER_NIC:-$(ip -4 route ls | grep default | grep -Po '(?<=dev )(\S+)' | head -1)}
+	if [[ -z $SERVER_NIC ]]; then
+		SERVER_NIC=$(ip -6 route show default | sed -ne 's/^default .* dev \([^ ]*\) .*$/\1/p')
+	fi
 	APPROVE_NIC=${APPROVE_NIC:-n}
 	until [[ ${SERVER_PUB_NIC} =~ ^[a-zA-Z0-9_]+$ || ${APPROVE_NIC} =~ n ]]; do
 		read -rp "Public interface: " -e -i "${SERVER_NIC}" SERVER_PUB_NIC

From 9a68ffa88b40b9128007a2da7ea601e175c92993 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sat, 22 Aug 2020 20:54:27 +0000
Subject: [PATCH 05/12] Exit if the client exists

---
 wireguard-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index 063a2ce..c705a93 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -252,6 +252,7 @@ function newClient() {
 			echo ""
 			echo "A client with the specified name was already created, please choose another name."
 			echo ""
+			exit 1
 		fi
 	done
 

From 9d600fce159372747950f3061e6def4036c2bffa Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 23 Aug 2020 09:22:11 +0000
Subject: [PATCH 06/12] Suggest the host bit of IPv4 when asking for the host
 bit of IPv6

The host bit would surely be the same for both IPv4 and IPv6.
---
 wireguard-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index c705a93..2eabae1 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -285,7 +285,7 @@ function newClient() {
 
 	until [[ ${IPV6_EXISTS} == '0' ]]; do
 		until [[ ${CLIENT_DOT_IPV6} =~ ^[a-f0-9]{1,4}$ ]]; do
-			read -rp "Client's WireGuard IPv6: ${SERVER_WG_IPV6::-1}" -e -i "${CLIENT_DOT_IPV6}" CLIENT_DOT_IPV6
+			read -rp "Client's WireGuard IPv6: ${SERVER_WG_IPV6::-1}" -e -i "${CLIENT_DOT_IPV4}" CLIENT_DOT_IPV6
 		done
 		CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT_IPV6}"
 		IPV6_EXISTS=$(grep -c "${CLIENT_WG_IPV6}" "/etc/wireguard/${SERVER_WG_NIC}.conf")

From 812ea87ca9594292248a8c49b3b349cdd5449003 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 23 Aug 2020 09:37:28 +0000
Subject: [PATCH 07/12] Merge client's IPv4 and IPv6 questions

The host bit would surely be the same for both IPv4 and IPv6.
---
 README.md            |  8 +++-----
 wireguard-install.sh | 24 +++++-------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 0cb8b5e..81f59f1 100644
--- a/README.md
+++ b/README.md
@@ -62,10 +62,9 @@ If you want to customise your installation, you can export them or specify them
 - `CLIENT_DNS_1=176.103.130.130`
 - `CLIENT_DNS_2=176.103.130.131`
 - `CLIENT_NAME=client`
-- `CLIENT_DOT_IPV4=2`
-- `CLIENT_DOT_IPV6=2`
+- `CLIENT_DOT=2`
 
-If the server is behind NAT, you can specify its endpoint with the `SERVER_PUB_IP` variable. If the endpoint is the public IP address which it is behind, you can use `SERVER_PUB_IP=$(curl ifconfig.co)` (the script will default to this). The endpoint can be an IP or a domain.
+If the server is behind NAT, you can specify its endpoint with the `SERVER_PUB_IP` variable. If the endpoint is the public IP address which it is behind, you can use `SERVER_PUB_IP=$(curl https://ifconfig.co)` (the script will default to this). The endpoint can be an IP or a domain.
 
 Other variables can be set depending on your choice (`SERVER_NIC`). You can search for them in the `installQuestions()` function of the script.
 
@@ -79,8 +78,7 @@ The following Bash script adds a new user `foo` to an existing WireGuard configu
 #!/bin/bash
 export MENU_OPTION="1"
 export CLIENT_NAME="foo"
-export CLIENT_DOT_IPV4="3"
-export CLIENT_DOT_IPV6="3"
+export CLIENT_DOT="3"
 ./wireguard-install.sh
 ```
 
diff --git a/wireguard-install.sh b/wireguard-install.sh
index 2eabae1..5543cfa 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -139,8 +139,7 @@ function installWireGuard() {
 		CLIENT_DNS_1=${CLIENT_DNS_1:-176.103.130.130}
 		CLIENT_DNS_2=${CLIENT_DNS_2:-176.103.130.131}
 		CLIENT_NAME=${CLIENT_NAME:-client}
-		CLIENT_DOT_IPV4=${CLIENT_DOT_IPV4:-2}
-		CLIENT_DOT_IPV6=${CLIENT_DOT_IPV6:-2}
+		CLIENT_DOT=${CLIENT_DOT:-2}
 
 		# Behind NAT, we'll default to the publicly reachable IPv4.
 		SERVER_PUB_IP=${SERVER_PUB_IP:-$(curl https://ifconfig.co)}
@@ -270,10 +269,10 @@ function newClient() {
 	fi
 
 	until [[ ${IPV4_EXISTS} == '0' ]]; do
-		until [[ ${CLIENT_DOT_IPV4} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do
-			read -rp "Client's WireGuard IPv4: ${SERVER_WG_IPV4::-1}" -e -i "${CLIENT_DOT_IPV4}" CLIENT_DOT_IPV4
+		until [[ ${CLIENT_DOT} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do
+			read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4::-1}" -e -i "${CLIENT_DOT}" CLIENT_DOT
 		done
-		CLIENT_WG_IPV4="${SERVER_WG_IPV4::-1}${CLIENT_DOT_IPV4}"
+		CLIENT_WG_IPV4="${SERVER_WG_IPV4::-1}${CLIENT_DOT}"
 		IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4" "/etc/wireguard/${SERVER_WG_NIC}.conf")
 
 		if [[ ${IPV4_EXISTS} == '1' ]]; then
@@ -282,20 +281,7 @@ function newClient() {
 			echo ""
 		fi
 	done
-
-	until [[ ${IPV6_EXISTS} == '0' ]]; do
-		until [[ ${CLIENT_DOT_IPV6} =~ ^[a-f0-9]{1,4}$ ]]; do
-			read -rp "Client's WireGuard IPv6: ${SERVER_WG_IPV6::-1}" -e -i "${CLIENT_DOT_IPV4}" CLIENT_DOT_IPV6
-		done
-		CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT_IPV6}"
-		IPV6_EXISTS=$(grep -c "${CLIENT_WG_IPV6}" "/etc/wireguard/${SERVER_WG_NIC}.conf")
-
-		if [[ ${IPV6_EXISTS} == '1' ]]; then
-			echo ""
-			echo "A client with the specified IPv6 was already created, please choose another IPv6."
-			echo ""
-		fi
-	done
+	CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT}"
 
 	# Generate key pair for the client
 	CLIENT_PRIV_KEY=$(wg genkey)

From 8a977598039eb265eb3c9b00991f2ba2f69ef7c1 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 23 Aug 2020 09:39:16 +0000
Subject: [PATCH 08/12] Exit if the client IP is in use

---
 wireguard-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index 5543cfa..b0c0217 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -279,6 +279,7 @@ function newClient() {
 			echo ""
 			echo "A client with the specified IPv4 was already created, please choose another IPv4."
 			echo ""
+			exit 1
 		fi
 	done
 	CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT}"

From be360d410b50397578fc0474d820586cb3d66a47 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 23 Aug 2020 09:59:27 +0000
Subject: [PATCH 09/12] Allow headless user revokation by CLIENT_NAME

---
 README.md            | 13 +++++++++++++
 wireguard-install.sh | 33 ++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 81f59f1..6d6449d 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,19 @@ export CLIENT_DOT="3"
 ./wireguard-install.sh
 ```
 
+## Headless User Revokation
+
+It's also possible to automate the revokation of an existing user. Here, the key is to provide the (string) value of the `MENU_OPTION` variable along with the remaining mandatory variables before invoking the script.
+
+The following Bash script revokes an user `foo` from an existing WireGuard configuration
+
+```bash
+#!/bin/bash
+export MENU_OPTION="2"
+export CLIENT_NAME="foo"
+./wireguard-install.sh
+```
+
 ## Providers
 
 I recommend these cheap cloud providers for your VPN server:
diff --git a/wireguard-install.sh b/wireguard-install.sh
index b0c0217..b65e2ee 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -336,18 +336,29 @@ function revokeClient() {
 
 	echo ""
 	echo "Select the existing client you want to revoke"
-	grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
-	until [[ ${CLIENT_NUMBER} -ge 1 && ${CLIENT_NUMBER} -le ${NUMBER_OF_CLIENTS} ]]; do
-		if [[ ${CLIENT_NUMBER} == '1' ]]; then
-			read -rp "Select one client [1]: " CLIENT_NUMBER
-		else
-			read -rp "Select one client [1-${NUMBER_OF_CLIENTS}]: " CLIENT_NUMBER
+
+	if [[ -z ${CLIENT_NAME} ]]; then
+		grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
+		until [[ ${CLIENT_NUMBER} -ge 1 && ${CLIENT_NUMBER} -le ${NUMBER_OF_CLIENTS} ]] || [[ -n ${CLIENT_NAME} ]]; do
+			if [[ ${CLIENT_NUMBER} == '1' ]]; then
+				read -rp "Select one client [1]: " CLIENT_NUMBER
+			else
+				read -rp "Select one client [1-${NUMBER_OF_CLIENTS}]: " CLIENT_NUMBER
+			fi
+		done
+
+		# match the selected number to a client name
+		CLIENT_NAME=$(grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${CLIENT_NUMBER}"p)
+	else
+		CLIENT_EXISTS=$(grep -c -E "^### Client ${CLIENT_NAME}\$" "/etc/wireguard/${SERVER_WG_NIC}.conf")
+
+		if [[ ${CLIENT_EXISTS} == '1' ]]; then
+			echo ""
+			echo "The client with the specified name doesn't exists."
+			echo ""
+			exit 1
 		fi
-	done
-
-	# match the selected number to a client name
-	CLIENT_NAME=$(grep -E "^### Client" "/etc/wireguard/${SERVER_WG_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${CLIENT_NUMBER}"p)
-
+	fi
 	# remove [Peer] block matching $CLIENT_NAME
 	sed -i "/^### Client ${CLIENT_NAME}\$/,/^$/d" "/etc/wireguard/${SERVER_WG_NIC}.conf"
 

From ee99d5b3c31671694ee8a777870b6270cced1935 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 23 Aug 2020 10:05:49 +0000
Subject: [PATCH 10/12] Clarify the client IP assignment

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6d6449d..3db6482 100644
--- a/README.md
+++ b/README.md
@@ -72,13 +72,12 @@ Other variables can be set depending on your choice (`SERVER_NIC`). You can sear
 
 It's also possible to automate the addition of a new user. Here, the key is to provide the (string) value of the `MENU_OPTION` variable along with the remaining mandatory variables before invoking the script.
 
-The following Bash script adds a new user `foo` to an existing WireGuard configuration
+The following Bash script adds a new user `foo` to an existing WireGuard configuration. The wireguard-install script will automatically assign a free IP to the client. You can assign a specific one by setting its Host ID to the variable `CLIENT_DOT`.
 
 ```bash
 #!/bin/bash
 export MENU_OPTION="1"
 export CLIENT_NAME="foo"
-export CLIENT_DOT="3"
 ./wireguard-install.sh
 ```
 

From 6188c4ee1d3e7e4200e1a9d1f1429cd9154b056f Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 6 Sep 2020 08:19:15 +0000
Subject: [PATCH 11/12] Fix substitution for the server IP

Previously it wouldn't work when the HOST BIT was more than 1 digit https://github.com/angristan/wireguard-install/pull/92#discussion_r460073438
---
 wireguard-install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index b65e2ee..0f761eb 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -270,9 +270,9 @@ function newClient() {
 
 	until [[ ${IPV4_EXISTS} == '0' ]]; do
 		until [[ ${CLIENT_DOT} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do
-			read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4::-1}" -e -i "${CLIENT_DOT}" CLIENT_DOT
+			read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4%.*}." -e -i "${CLIENT_DOT}" CLIENT_DOT
 		done
-		CLIENT_WG_IPV4="${SERVER_WG_IPV4::-1}${CLIENT_DOT}"
+		CLIENT_WG_IPV4="${SERVER_WG_IPV4%.*}.${CLIENT_DOT}"
 		IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4" "/etc/wireguard/${SERVER_WG_NIC}.conf")
 
 		if [[ ${IPV4_EXISTS} == '1' ]]; then
@@ -282,7 +282,7 @@ function newClient() {
 			exit 1
 		fi
 	done
-	CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT}"
+	CLIENT_WG_IPV6="${SERVER_WG_IPV6%:*}:${CLIENT_DOT}"
 
 	# Generate key pair for the client
 	CLIENT_PRIV_KEY=$(wg genkey)

From 4d0005fe003ecf8e200edda60b7a851a6cdf7770 Mon Sep 17 00:00:00 2001
From: randomshell <randshell@protonmail.com>
Date: Sun, 6 Sep 2020 08:22:32 +0000
Subject: [PATCH 12/12] Fix CLIENT BIT suggestion

---
 wireguard-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wireguard-install.sh b/wireguard-install.sh
index 0f761eb..9c2e4f4 100644
--- a/wireguard-install.sh
+++ b/wireguard-install.sh
@@ -270,7 +270,7 @@ function newClient() {
 
 	until [[ ${IPV4_EXISTS} == '0' ]]; do
 		until [[ ${CLIENT_DOT} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do
-			read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4%.*}." -e -i "${CLIENT_DOT}" CLIENT_DOT
+			read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4%.*}." -e -i "${DOT_IP}" CLIENT_DOT
 		done
 		CLIENT_WG_IPV4="${SERVER_WG_IPV4%.*}.${CLIENT_DOT}"
 		IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4" "/etc/wireguard/${SERVER_WG_NIC}.conf")