Date: Mon, 12 Dec 2016 18:52:22 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309919 - head/usr.sbin/bsdinstall/scripts Message-ID: <201612121852.uBCIqM2D077274@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Mon Dec 12 18:52:22 2016 New Revision: 309919 URL: https://svnweb.freebsd.org/changeset/base/309919 Log: Whitespace Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 18:48:00 2016 (r309918) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 18:52:22 2016 (r309919) @@ -56,12 +56,12 @@ country_set() if [ "$iface_up" ]; then # Restart wpa_supplicant(8) (should not fail). wpa_supplicant -B -i $WLAN_IFACE -c \ - "$BSDINSTALL_TMPETC/wpa_supplicant.conf" + "$BSDINSTALL_TMPETC/wpa_supplicant.conf" fi if [ "$error_str" ]; then dialog --backtitle "FreeBSD Installer" --title "Error" \ - --yes-label Change --no-label Ignore --yesno \ - "Error while applying chosen settings ($error_str)" 0 0 + --yes-label Change --no-label Ignore --yesno \ + "Error while applying chosen settings ($error_str)" 0 0 if [ $? -eq $DIALOG_OK ]; then return $FAILURE # Restart else @@ -101,7 +101,7 @@ dialog_country_select() else printf " " } - }' | sort -k 2 | tr '\n' ' ' ) + }' | sort -k 2 | tr '\n' ' ' ) # Change default cursor position (if required). if [ "$1" != "<not selected>" ]; then @@ -112,29 +112,31 @@ dialog_country_select() fi f_dialog_menu_size height width rows \"Regdomain selection\" \ - \"FreeBSD Installer\" \"Select your regdomain.\" \ - \"\" $regdomains + \"FreeBSD Installer\" \"Select your regdomain.\" \ + \"\" $regdomains regdomain=$( sh -c "dialog \ - --backtitle \"FreeBSD Installer\" \ - --title \"Regdomain selection\" \ - --cancel-label \"Skip\" \ - $def_item_regdomain \ - --no-items \ - --stdout \ - --menu \"Select your regdomain.\" \ - $height $width $rows $regdomains" ) + --backtitle \"FreeBSD Installer\" \ + --title \"Regdomain selection\" \ + --cancel-label \"Skip\" \ + $def_item_regdomain \ + --no-items \ + --stdout \ + --menu \"Select your regdomain.\" \ + $height $width $rows $regdomains" + ) f_dialog_menu_size height width rows \"Country selection\" \ \"FreeBSD Installer\" \"Select your country.\" \ \"\" $countries country=$( sh -c "dialog \ - --backtitle \"FreeBSD Installer\" \ - --title \"Country selection\" \ - --cancel-label \"Skip\" \ - $def_item_country \ - --stdout \ - --menu \"Select your country.\" \ - $height $width $rows $countries" ) + --backtitle \"FreeBSD Installer\" \ + --title \"Country selection\" \ + --cancel-label \"Skip\" \ + $def_item_country \ + --stdout \ + --menu \"Select your country.\" \ + $height $width $rows $countries" + ) country_set "$regdomain" "$country" @@ -195,8 +197,7 @@ if [ "$BSDINSTALL_CONFIGCURRENT" ]; then fi fi -while : -do +while :; do SCANSSID=0 output=$( wpa_cli scan 2>&1 ) f_dprintf "%s" "$output"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612121852.uBCIqM2D077274>