diff options
| author | Devin Teske <dteske@FreeBSD.org> | 2016-12-08 19:26:22 +0000 |
|---|---|---|
| committer | Devin Teske <dteske@FreeBSD.org> | 2016-12-08 19:26:22 +0000 |
| commit | 3d2b0857bfd12fc671ee6d24e67819f3ce9b35b5 (patch) | |
| tree | 675607af4b8b097450f19cacca862f8e4d69fe27 | |
| parent | d78e7e3b587bfc36cd8c5ce3c8effce827e192dd (diff) | |
| download | src-3d2b0857bfd12fc671ee6d24e67819f3ce9b35b5.tar.gz src-3d2b0857bfd12fc671ee6d24e67819f3ce9b35b5.zip | |
Remove unnecessary trailing backslashes
Notes
Notes:
svn path=/head/; revision=309719
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/wlanconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index 32004185a410..238e657336f7 100755 --- a/usr.sbin/bsdinstall/scripts/wlanconfig +++ b/usr.sbin/bsdinstall/scripts/wlanconfig @@ -46,8 +46,8 @@ echo >> $BSDINSTALL_TMPETC/wpa_supplicant.conf # 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 || ([ ! -z $BSDINSTALL_CONFIGCURRENT ] && \ - wpa_supplicant -B -i $1 -c $BSDINSTALL_TMPETC/wpa_supplicant.conf)) || \ +(wpa_cli ping >/dev/null 2>/dev/null || ([ ! -z $BSDINSTALL_CONFIGCURRENT ] && + wpa_supplicant -B -i $1 -c $BSDINSTALL_TMPETC/wpa_supplicant.conf)) || (dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \ "Could not start wpa_supplicant!" 0 0; exit 1) || exit 1 @@ -86,7 +86,7 @@ country_set() if [ ! -z "$iface_up" ]; then ifconfig $WLAN_IFACE down fi - error_str=`ifconfig $WLAN_IFACE $ifconfig_args 2>&1 | \ + error_str=`ifconfig $WLAN_IFACE $ifconfig_args 2>&1 | sed 's/ifconfig: //'` if [ ! -z "$iface_up" ]; then # Restart wpa_supplicant(8) (should not fail). @@ -123,9 +123,9 @@ dialog_country_select() # Parse available countries/regdomains input=`ifconfig $WLAN_IFACE list countries | sed 's/DEBUG//gi'` - regdomains=`echo $input | sed 's/.*domains://' | tr ' ' '\n' | \ + regdomains=`echo $input | sed 's/.*domains://' | tr ' ' '\n' | sort | tr '\n' ' '` - countries=`echo $input | sed 's/Country codes://' | \ + countries=`echo $input | sed 's/Country codes://' | sed 's/Regulatory.*//' | awk '{ for (i = 1; i <= NF; i++) { printf "%s", $i @@ -222,7 +222,7 @@ do if [ -z "$NETWORKS" ]; then dialog --backtitle "FreeBSD Installer" --title "Error" \ - --yesno "No wireless networks were found. Rescan?" 0 0 && \ + --yesno "No wireless networks were found. Rescan?" 0 0 && continue exit 1 fi |