From db0cbac8aba111f4699308b14c5827aab9ab8ad0 Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Mon, 6 Feb 2023 10:14:39 +0100
Subject: [PATCH] Add an explicit "None" choice while adding wpa network
 passphrase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And refactorise those menu choices computing…

Signed-off-by: Willow Barraco <contact@willowbarraco.fr>
Signed-off-by: Peter John Hartman <peterjohnhartman@gmail.com>
---
 scripts/core/sxmo_networks.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/core/sxmo_networks.sh b/scripts/core/sxmo_networks.sh
index dcfd52d..02c7a72 100755
--- a/scripts/core/sxmo_networks.sh
+++ b/scripts/core/sxmo_networks.sh
@@ -130,19 +130,21 @@ addnetworkgsmmenu() {
 }
 
 addnetworkwpamenu() {
-	SSID="$(
-		nmcli d wifi list | tail -n +2 | grep -v '^\*' | awk -F'  ' '{ print $6 }' | grep -v '\-\-' |
-		xargs -0 printf "$icon_cls Close Menu\n%s" |
-		sxmo_dmenu_with_kb.sh -p "SSID"
+	SSID="$(cat <<EOF | sxmo_dmenu_with_kb.sh -p "SSID"
+$icon_cls Close Menu
+$(nmcli d wifi list | tail -n +2 | grep -v '^\*' | awk -F'  ' '{ print $6 }' | grep -v '\-\-')
+EOF
 	)"
 	[ -z "$SSID" ] && return
 	echo "$SSID" | grep -q "Close Menu" && return
 
-	PASSPHRASE="$(
-		echo "$icon_cls Close Menu" |
-			sxmo_dmenu_with_kb.sh -p "Passphrase"
+	PASSPHRASE="$(cat <<EOF | sxmo_dmenu_with_kb.sh -p "Passphrase"
+$icon_cls Close Menu
+None
+EOF
 	)"
-	if [ -z "$PASSPHRASE" ]; then
+
+	if [ -z "$PASSPHRASE" ] || [ "None" = "$PASSPHRASE" ]; then
 		unset PASSPHRASE
 	fi
 	echo "$PASSPHRASE" | grep -q "Close Menu" && return