From 89fc8acc2da55edcbd7013bc73b080cba161f7fa Mon Sep 17 00:00:00 2001
From: dteske <dteske@FreeBSD.org>
Date: Tue, 13 Dec 2016 01:54:44 +0000
Subject: [PATCH] Start deconstructing a conveluted hunk of code

---
 usr.sbin/bsdinstall/scripts/wlanconfig | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index fe55f6a626b0..834090e0db3a 100755
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -165,10 +165,12 @@ EOF
 # Try to reach wpa_supplicant. If it isn't running and we can modify the
 # existing system, start it. Otherwise, fail.
 #
-wpa_cli ping > /dev/null 2>&1 || ([ "$BSDINSTALL_CONFIGCURRENT" ] &&
-	wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf") ||
-	$DIALOG --backtitle "$DIALOG_BACKTITLE" --title "$msg_error" --msgbox \
-	"Could not start wpa_supplicant!" 0 0; exit 1 || exit 1
+if ! wpa_cli ping > /dev/null 2>&1; then
+	([ "$BSDINSTALL_CONFIGCURRENT" ] &&
+		wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf") ||
+		$DIALOG --backtitle "$DIALOG_BACKTITLE" --title "$msg_error" --msgbox \
+		"Could not start wpa_supplicant!" 0 0; exit 1 || exit 1
+fi
 
 # See if we succeeded
 wpa_cli ping > /dev/null 2>&1