QR code show

wireguard_scripts/next_client_add.sh

@@ -16,8 +16,9 @@ client_name="$1"
 # Global variables
 server_pubkey=""
 client_pubkey=""
-folder_log="" 
+folder_log=""
 ips=""
+users=""
 
 # ==============================================================================
 # 2. HELPER FUNCTIONS
@@ -39,28 +40,29 @@ environment_var() {
     # --- Variable Checks ---
     server_pubkey=$(cat ${WG0_DIR}/publickey)
     ips=$(grep -i '^\s*AllowedIPs\s*=\s*' "${WG0_DIR}/wg0.conf" | sed 's/^\s*AllowedIPs\s*=\s*//I; s/\s*$//')
+    users=$(grep -i '^\s*# BEGIN_PEER \s*' "${WG0_DIR}/wg0.conf" | sed 's/^\s*# BEGIN_PEER \s*//i; s/\s*$//')
 }
 
 # Find the last registered client IP
 find_last_ip() {
     # Find the last ip an create the next ip
     if [ -n "$ips" ]; then
-        last=$(printf '%s\n' "$ips" | tail -1)
+        last=$(printf "%s\n" "$ips" | tail -1)
         addr=${last%/*}   # strip /32 if present
         IFS=. read -r a b c d <<< "$addr"
         next_ip="10.0.0.$((d + 1))"
-        printf 'Last CIDR: %s\nNext IP: %s/32\n' "$last" "$next_ip"
+        printf "Last CIDR: %s\nNext IP: %s/32\n" "$last" "$next_ip"
     else
         next_ip="10.0.0.2"
-        printf 'No peers found, starting at %s/32\n' "$next_ip"
+        printf "No peers found, starting at %s/32\n" "$next_ip"
     fi
 }
 
 # Display QR Code and Generate PNG
 display_qr_code() {
     local config_file="$1"
-    # Derive user_folder from the already established global TOOLS_DIR
-    local user_folder="${TOOLS_DIR}/logs/${client_name}"
+    # Derive user folder path from the already established global TOOLS_DIR
+    local user_folder_path="${TOOLS_DIR}/logs/${client_name}"
     local base_name="${client_name}"
 
     if command -v qrencode >/dev/null 2>&1; then
@@ -71,7 +73,7 @@ display_qr_code() {
         printf '\n'
 
         # 2. Generate PNG version in the user's log folder
-        local png_file="${user_folder}/${base_name}.png"
+        local png_file="${user_folder_path}/${base_name}.png"
         
         # -t PNG: Output format
         # -o: Output file path
@@ -92,10 +94,10 @@ display_qr_code() {
 client_create_new() {
     # Make sure that the client name doesn't have spaces
     if [[ "$client_name" =~ [[:space:]] ]]; then
-        printf 'Error: Client name cannot contain spaces. Use underscores instead of spaces.\n'
+        printf "Error: Client name cannot contain spaces. Use underscores instead of spaces.\n"
         exit 1
     elif [[ "$client_name" == "" ]]; then
-        printf 'Error: Client name argument is mandatory. Please provide one first.\n'
+        printf "Error: Client name argument is mandatory. Please provide one first.\n"
         exit 1
     fi
 
@@ -209,8 +211,12 @@ main() {
     environment_var
 
     # Print current values
-    printf 'Public Key of the server: %s\n' "$server_pubkey"
-    printf 'List of current clients: %s\n' "$ips"
+    printf "Public Key of the server: %s\n" "$server_pubkey"
+    printf "List of current clients:\n"
+    paste -d '|' <(echo "$users") <(echo "$ips") | while IFS='|' read -r user ip; do
+        echo "User: $user -> IP: $ip"
+    done
+    printf "\n"
 
     # Find the last IP
     find_last_ip