]> xenbits.xensource.com Git - people/royger/freebsd.git/commitdiff
Why repeat yourself when you can send stderr to the same place as stdout?
authordteske <dteske@FreeBSD.org>
Tue, 13 Dec 2016 01:50:22 +0000 (01:50 +0000)
committerdteske <dteske@FreeBSD.org>
Tue, 13 Dec 2016 01:50:22 +0000 (01:50 +0000)
usr.sbin/bsdinstall/scripts/wlanconfig

index e247e2d3bd7031bba77e3a5a8baa4bfa08900147..96a0de1c0ecfaf27edd325115ed4e5ec9b721966 100755 (executable)
@@ -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" \