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

Whitespace

Browse Source
This commit is contained in:
Devin Teske 2016-12-12 18:52:22 +00:00
parent 9ca8b7be34
commit 76b07bd950
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,12 +56,12 @@ country_set()
if [ "$iface_up" ]; then if [ "$iface_up" ]; then
# Restart wpa_supplicant(8) (should not fail). # Restart wpa_supplicant(8) (should not fail).
wpa_supplicant -B -i $WLAN_IFACE -c \ wpa_supplicant -B -i $WLAN_IFACE -c \
"$BSDINSTALL_TMPETC/wpa_supplicant.conf" "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
fi fi
if [ "$error_str" ]; then if [ "$error_str" ]; then
dialog --backtitle "FreeBSD Installer" --title "Error" \ dialog --backtitle "FreeBSD Installer" --title "Error" \
--yes-label Change --no-label Ignore --yesno \ --yes-label Change --no-label Ignore --yesno \
"Error while applying chosen settings ($error_str)" 0 0 "Error while applying chosen settings ($error_str)" 0 0
if [ $? -eq $DIALOG_OK ]; then if [ $? -eq $DIALOG_OK ]; then
return $FAILURE # Restart return $FAILURE # Restart
else else
@ -101,7 +101,7 @@ dialog_country_select()
else else
printf " " printf " "
} }
}' | sort -k 2 | tr '\n' ' ' ) }' | sort -k 2 | tr '\n' ' ' )
# Change default cursor position (if required). # Change default cursor position (if required).
if [ "$1" != "<not selected>" ]; then if [ "$1" != "<not selected>" ]; then
@ -112,29 +112,31 @@ dialog_country_select()
fi fi
f_dialog_menu_size height width rows \"Regdomain selection\" \ f_dialog_menu_size height width rows \"Regdomain selection\" \
\"FreeBSD Installer\" \"Select your regdomain.\" \ \"FreeBSD Installer\" \"Select your regdomain.\" \
\"\" $regdomains \"\" $regdomains
regdomain=$( sh -c "dialog \ regdomain=$( sh -c "dialog \
--backtitle \"FreeBSD Installer\" \ --backtitle \"FreeBSD Installer\" \
--title \"Regdomain selection\" \ --title \"Regdomain selection\" \
--cancel-label \"Skip\" \ --cancel-label \"Skip\" \
$def_item_regdomain \ $def_item_regdomain \
--no-items \ --no-items \
--stdout \ --stdout \
--menu \"Select your regdomain.\" \ --menu \"Select your regdomain.\" \
$height $width $rows $regdomains" ) $height $width $rows $regdomains"
)
f_dialog_menu_size height width rows \"Country selection\" \ f_dialog_menu_size height width rows \"Country selection\" \
\"FreeBSD Installer\" \"Select your country.\" \ \"FreeBSD Installer\" \"Select your country.\" \
\"\" $countries \"\" $countries
country=$( sh -c "dialog \ country=$( sh -c "dialog \
--backtitle \"FreeBSD Installer\" \ --backtitle \"FreeBSD Installer\" \
--title \"Country selection\" \ --title \"Country selection\" \
--cancel-label \"Skip\" \ --cancel-label \"Skip\" \
$def_item_country \ $def_item_country \
--stdout \ --stdout \
--menu \"Select your country.\" \ --menu \"Select your country.\" \
$height $width $rows $countries" ) $height $width $rows $countries"
)
country_set "$regdomain" "$country" country_set "$regdomain" "$country"
@ -195,8 +197,7 @@ if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
fi fi
fi fi
while : while :; do
do
SCANSSID=0 SCANSSID=0
output=$( wpa_cli scan 2>&1 ) output=$( wpa_cli scan 2>&1 )
f_dprintf "%s" "$output" f_dprintf "%s" "$output"