Merge lp:~robru/phablet-tools/fix-help into lp:phablet-tools

[Robert Bruce Park]

Improve helpfulness of help output.

Improve helpfulness of help output.

[Robert Bruce Park (robru)]

String changes only and tested by me.

review: Approve

=== modified file 'citrain'
--- citrain	2015-05-07 15:24:45 +0000
+++ citrain	2015-09-25 18:08:37 +0000
@@ -17,6 +17,7 @@
 usage () {
 cat <<EOF
 usage: $0 COMMAND SILO-NUMBER [DEVICE-PASSWORD] [DISTRIBUTION]
+$1
 
 COMMANDS:
     host-install        Deprecated. Please use host-upgrade instead.
@@ -26,9 +27,6 @@
     host-purge          Uses ppa-purge to uninstall the silo contents from the host machine.
     device-purge        Not implemented.
 
-SILO-NUMBER:
-    0..30
-
 DISTRIBUTION: (optional)
     ubuntu
     ubuntu-rtm
@@ -50,24 +48,16 @@
 
 # Read the first positional argument.
 COMMAND="$1"
-[ $# -gt 0 ] && shift || usage
+[ $# -gt 0 ] && shift || usage "Missing COMMAND"
 
 # Check that silo number is really a number.
-echo "$1" | egrep -q "^[0-9]{1,3}$" || usage
+echo "$1" | egrep -q "^[0-9]{1,3}$" || usage "SILO-NUMBER not a number."
 
 # Read the second positional argument.
 SILO=landing-$(echo "000$1" | rev | cut -c -3 | rev)
-[ $# -gt 0 ] && shift || usage
+[ $# -gt 0 ] && shift || usage "Missing SILO-NUMBER."
 
 case "$COMMAND" in
-    host-install)
-        usage
-        ;;
-
-    device-install)
-        usage
-        ;;
-
     host-upgrade)
         set -x
         sudo add-apt-repository $PPA/$SILO
@@ -79,7 +69,7 @@
         check_devices
         # Read the third positional argument.
         PASSWORD="$1"
-        [ $# -gt 0 ] && shift || usage
+        [ $# -gt 0 ] && shift || usage "Missing DEVICE-PASSWORD"
 
         set -x
         adb shell egrep ^deb /etc/apt/sources.list.d/\*.list
@@ -114,6 +104,6 @@
         ;;
 
     *)
-        usage
+        usage "Unknown COMMAND."
         ;;
 esac