Why repeat yourself when you can send stderr to the same place as stdout?

This commit is contained in:
Devin Teske
2016-12-13 01:50:22 +00:00
parent 66ef7d9455
commit 751993945a
+2 -2
View File
@@ -165,13 +165,13 @@ 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>/dev/null || ([ "$BSDINSTALL_CONFIGCURRENT" ] &&
(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
# See if we succeeded
wpa_cli ping >/dev/null 2>/dev/null
wpa_cli ping > /dev/null 2>&1
if [ $? -ne 0 -a ! "$BSDINSTALL_CONFIGCURRENT" ]; then
$DIALOG \
--title "$msg_error" \