From 3daf90670501024cc9fd671295d4ce7249c6755a Mon Sep 17 00:00:00 2001
From: Rob Bishop <rob@rob-bishop.com>
Date: Sun, 19 May 2013 11:09:23 +0100
Subject: [PATCH] Updated in response to comments from popcornmix

---
 raspi-config | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/raspi-config b/raspi-config
index 73c9a09..cdcdbb7 100755
--- a/raspi-config
+++ b/raspi-config
@@ -509,34 +509,33 @@ if [ -n "${OPT_MEMORY_SPLIT:-}" ]; then
 fi
 
 do_4() {
-    FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (Raspi-config)" --menu "Internationalisation Options" $LINES $COLUMNS $(($LINES-8)) --cancel-button Back --ok-button Select \
+    FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Internationalisation Options" $LINES $COLUMNS $(($LINES-8)) --cancel-button Back --ok-button Select \
         "I1 Change Locale" "Set up language and regional settings to match your location" \
         "I2 Change Timezone" "Set up timezone to match your location" \
         "I3 Change Keyboard Layout" "Set the keyboard layout to match your keyboard" \
         3>&1 1>&2 2>&3)
     RET=$?
     if [ $RET -eq 1 ]; then
-        return 1
+        return 0
     elif [ $RET -eq 0 ]; then
-        "do_$(echo $FUN | head -c 1)" || whiptail --msgbox "There was an error running option $FUN" 20 60 1
+        "do_$(echo $FUN | head -c 2)" || whiptail --msgbox "There was an error running option $FUN" 20 60 1
     fi
 }
 
 do_7() {
-    FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (Raspi-config)" --menu "Advanced Options" $LINES $COLUMNS $(($LINES-8)) --cancel-button Back --o\
-k-button Select \
-        "A1 Overscan" "You may need to configure overscan if black bars are present on display" \
-	"A2 Hostname" "Set the visibile name for this Pi on a network" \ 
-	"A3 Memory Split" "Change the amount of memory made available to the GPU" \ 
-	"A4 Overclock" "Configure overclocking for your Pi" \ 
-	"A5 SSH" "Enable/Disable SSH server" \ 
-	"A6 Update" "Update this tool to the latest version" \ 
+    FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $LINES $COLUMNS $(($LINES-8)) --cancel-button Back --ok-button Select \
+	"A1 Overscan" "You may need to configure overscan if black bars are present on display" \
+	"A2 Hostname" "Set the visible name for this Pi on a network" \
+	"A3 Memory Split" "Change the amount of memory made available to the GPU" \
+	"A4 Overclock" "Configure overclocking for your Pi" \
+	"A5 SSH" "Enable/Disable remote command line access to your Pi using SSH" \
+	"A6 Update" "Update this tool to the latest version" \
 	3>&1 1>&2 2>&3)
     RET=$?
     if [ $RET -eq 1 ]; then
-        return 1
+        return 0
     elif [ $RET -eq 0 ]; then
-        "do_$(echo $FUN | head -c 1)" || whiptail --msgbox "There was an error running option $FUN" 20 60 1
+        "do_$(echo $FUN | head -c 2)" || whiptail --msgbox "There was an error running option $FUN" 20 60 1
     fi
 }
 
@@ -548,7 +547,7 @@ eval `resize`
 while true; do
     FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Setup Options" $LINES $COLUMNS $(($LINES-8)) --cancel-button Finish --ok-button Select \
 	"1 Expand Filesystem" "Ensures that all of the SD card storage is available to the OS" \
-	"2 Change User Password" "Change password for the default username (pi)" \
+	"2 Change User Password" "Change password for the default user (pi)" \
 	"3 Enable Boot to Desktop" "Choose whether to boot into a desktop environment or the command-line" \
 	"4 Internationalisation Options" "Set up language and regional settings to match your location" \
 	"5 Enable Camera" "Enable this Pi to work with the Raspberry Pi Camera" \