Continued resolution of conveluted statement

We shouldn't be coding things like "x || (x && x) || x || x || x ..."

diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index a904546b4cb29a451b2204585776684efdda3b41..8887491bd5c3692ede80ade94efd72e264f51540 100755 (executable)
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -166,10 +166,12 @@ EOF
 # existing system, start it. Otherwise, fail.
 #
 if ! wpa_cli ping > /dev/null 2>&1; then
-       ([ "$BSDINSTALL_CONFIGCURRENT" ] &&
-               wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf") ||
+       if [ ! "$BSDINSTALL_CONFIGCURRENT" ]; then
                $DIALOG --backtitle "$DIALOG_BACKTITLE" --title "$msg_error" --msgbox \
-               "Wireless cannot be configured without making changes to the local system!" 0 0; exit 1 || exit 1
+                       "Wireless cannot be configured without making changes to the local system!" 0 0
+               exit 1
+       fi
+       wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf") || exit 1
 
        if ! wpa_cli ping > /dev/null 2>&1 && [ ! "$BSDINSTALL_CONFIGCURRENT" ]; then
                $DIALOG \