d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continued resolution of conveluted statement

Browse Source 
We shouldn't be coding things like "x || (x && x) || x || x || x ..."
This commit is contained in:
dteske 2016-12-13 02:04:50 +00:00
parent 3af2400435
commit 4442ea7869
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/bsdinstall/scripts/wlanconfig
View File

@ -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 \