summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-01-10 19:49:12 -0500
committerJameson Rollins <jrollins@finestructure.net>2010-01-10 19:49:12 -0500
commit109f4ed7d4aea89fa03701d105a9b8422209c170 (patch)
tree391197297dce514e815541c31ab8ade4762f07f7
parentcf7d2f1e843e429a462d2dd11430fd48b0281cb2 (diff)
parent749f1d84177c993d6382c1f80737e21d9fb1ee7b (diff)
Merge remote branch 'mjgoins/master'
-rwxr-xr-xsrc/monkeysphere2
-rwxr-xr-xsrc/monkeysphere-authentication2
-rwxr-xr-xsrc/monkeysphere-host2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index 0726ff9..f21ca7c 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -219,7 +219,7 @@ export LOG_PREFIX
# get subcommand
COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+[ "$COMMAND" ] || $PGRM help
shift
case $COMMAND in
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index f00bf5e..7870c0f 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -151,7 +151,7 @@ export LOG_PREFIX
# get subcommand
COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+[ "$COMMAND" ] || $PGRM help
shift
case $COMMAND in
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4ec533d..52a4373 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -238,7 +238,7 @@ export LOG_PREFIX
# get subcommand
COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+[ "$COMMAND" ] || $PGRM help
shift
case $COMMAND in