Merge remote branch 'jrollins/master'

[monkeysphere.git] / src / monkeysphere-authentication

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index df7d9bcf6ddf8fd2db17971973a37b7ca20ec0c8..7d08aacc12fb06d23130a539d9737e34e18459e1 100755 (executable)
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -136,7 +136,6 @@ LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='ms: '}
 
 # export variables needed in su invocation
 export DATE
-export MODE
 export LOG_LEVEL
 export KEYSERVER
 export MONKEYSPHERE_USER
@@ -150,9 +149,13 @@ export GNUPGHOME
 export CORE_KEYLENGTH
 export LOG_PREFIX
 
+if [ "$#" -eq 0 ] ; then 
+    usage
+    failure "Please supply a subcommand."
+fi
+
 # get subcommand
 COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
 shift
 
 case $COMMAND in
@@ -208,7 +211,7 @@ case $COMMAND in
        gpg_sphere "$@"
        ;;
 
-    'version'|'v')
+    'version'|'--version'|'v')
        version
        ;;
 
@@ -218,6 +221,6 @@ case $COMMAND in
 
     *)
         failure "Unknown command: '$COMMAND'
-Type '$PGRM help' for usage."
+Try '$PGRM help' for usage."
         ;;
 esac