Date: Tue, 13 Dec 2016 02:04:50 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309975 - head/usr.sbin/bsdinstall/scripts Message-ID: <201612130204.uBD24oUm054486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Tue Dec 13 02:04:50 2016 New Revision: 309975 URL: https://svnweb.freebsd.org/changeset/base/309975 Log: Continued resolution of conveluted statement We shouldn't be coding things like "x || (x && x) || x || x || x ..." Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 02:02:14 2016 (r309974) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 02:04:50 2016 (r309975) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612130204.uBD24oUm054486>