summaryrefslogtreecommitdiff
path: root/src/monkeysphere-authentication
diff options
context:
space:
mode:
Diffstat (limited to 'src/monkeysphere-authentication')
-rwxr-xr-xsrc/monkeysphere-authentication15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 057d14e..8c58645 100755
--- 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" ] || $PGRM help
shift
case $COMMAND in
@@ -161,14 +164,14 @@ case $COMMAND in
setup
;;
- 'update-users'|'update-user'|'u')
+ 'update-users'|'update-user'|'update'|'u')
source "${MASHAREDIR}/setup"
setup
source "${MASHAREDIR}/update_users"
update_users "$@"
;;
- 'refresh-keys'|'r')
+ 'refresh-keys'|'refresh'|'r')
source "${MASHAREDIR}/setup"
setup
gpg_sphere "--keyserver $KEYSERVER --refresh-keys"
@@ -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