Some function names changed for consistency.

This commit is contained in:
spl 2016-05-25 16:36:39 +01:00
parent 19e663c009
commit 137cafef51

View File

@ -314,7 +314,7 @@ get_wifi_country() {
grep country= /etc/wpa_supplicant/wpa_supplicant.conf | cut -d "=" -f 2 grep country= /etc/wpa_supplicant/wpa_supplicant.conf | cut -d "=" -f 2
} }
do_configure_wifi_country() { do_wifi_country() {
oIFS="$IFS" oIFS="$IFS"
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
IFS="/" IFS="/"
@ -346,7 +346,7 @@ get_hostname() {
cat /etc/hostname | tr -d " \t\n\r" cat /etc/hostname | tr -d " \t\n\r"
} }
do_change_hostname() { do_hostname() {
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "\ whiptail --msgbox "\
Please note: RFCs mandate that a hostname's labels \ Please note: RFCs mandate that a hostname's labels \
@ -1309,7 +1309,7 @@ do_internationalisation_menu() {
I1\ *) do_change_locale ;; I1\ *) do_change_locale ;;
I2\ *) do_change_timezone ;; I2\ *) do_change_timezone ;;
I3\ *) do_configure_keyboard ;; I3\ *) do_configure_keyboard ;;
I4\ *) do_configure_wifi_country ;; I4\ *) do_wifi_country ;;
*) whiptail --msgbox "Programmer error: unrecognized option" 20 60 1 ;; *) whiptail --msgbox "Programmer error: unrecognized option" 20 60 1 ;;
esac || whiptail --msgbox "There was an error running option $FUN" 20 60 1 esac || whiptail --msgbox "There was an error running option $FUN" 20 60 1
fi fi
@ -1336,7 +1336,7 @@ do_advanced_menu() {
elif [ $RET -eq 0 ]; then elif [ $RET -eq 0 ]; then
case "$FUN" in case "$FUN" in
A1\ *) do_overscan ;; A1\ *) do_overscan ;;
A2\ *) do_change_hostname ;; A2\ *) do_hostname ;;
A3\ *) do_memory_split ;; A3\ *) do_memory_split ;;
A4\ *) do_ssh ;; A4\ *) do_ssh ;;
A5\ *) do_spi ;; A5\ *) do_spi ;;