From 4442ea78692a5d68b51f6d165716984f5f9be47f Mon Sep 17 00:00:00 2001 From: dteske Date: Tue, 13 Dec 2016 02:04:50 +0000 Subject: [PATCH] Continued resolution of conveluted statement We shouldn't be coding things like "x || (x && x) || x || x || x ..." --- usr.sbin/bsdinstall/scripts/wlanconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index a904546b4cb2..8887491bd5c3 100755 --- 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 \ -- 2.39.5