projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'mjgoins/master'
[monkeysphere.git]
/
src
/
monkeysphere-authentication
diff --git
a/src/monkeysphere-authentication
b/src/monkeysphere-authentication
index 7870c0f0ada9b13e5dfd9777a2c09e695f50d181..8c58645bcb483fb30f04c88ca279806ff6c3e7a6 100755
(executable)
--- a/
src/monkeysphere-authentication
+++ b/
src/monkeysphere-authentication
@@
-149,9
+149,13
@@
export GNUPGHOME
export CORE_KEYLENGTH
export LOG_PREFIX
export CORE_KEYLENGTH
export LOG_PREFIX
+if [ "$#" -eq 0 ] ; then
+ usage
+ failure "Please supply a subcommand."
+fi
+
# get subcommand
COMMAND="$1"
# get subcommand
COMMAND="$1"
-[ "$COMMAND" ] || $PGRM help
shift
case $COMMAND in
shift
case $COMMAND in
@@
-160,14
+164,14
@@
case $COMMAND in
setup
;;
setup
;;
- 'update-users'|'update-user'|'u')
+ 'update-users'|'update-user'|'u
pdate'|'u
')
source "${MASHAREDIR}/setup"
setup
source "${MASHAREDIR}/update_users"
update_users "$@"
;;
source "${MASHAREDIR}/setup"
setup
source "${MASHAREDIR}/update_users"
update_users "$@"
;;
- 'refresh-keys'|'r')
+ 'refresh-keys'|'r
efresh'|'r
')
source "${MASHAREDIR}/setup"
setup
gpg_sphere "--keyserver $KEYSERVER --refresh-keys"
source "${MASHAREDIR}/setup"
setup
gpg_sphere "--keyserver $KEYSERVER --refresh-keys"
@@
-207,7
+211,7
@@
case $COMMAND in
gpg_sphere "$@"
;;
gpg_sphere "$@"
;;
- 'version'|'v')
+ 'version'|'
--version'|'
v')
version
;;
version
;;
@@
-217,6
+221,6
@@
case $COMMAND in
*)
failure "Unknown command: '$COMMAND'
*)
failure "Unknown command: '$COMMAND'
-T
ype
'$PGRM help' for usage."
+T
ry
'$PGRM help' for usage."
;;
esac
;;
esac