Merge remote branch 'mjgoins/master'

diff --git a/src/monkeysphere b/src/monkeysphere
index 0726ff94a61fdd492f6475978fec41bee711ba80..f21ca7c3603d85e1d0cfa432b957c203f1db6509 100755 (executable)
--- 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 f00bf5eef7658f89687f300052f6ea44f50bf57c..7870c0f0ada9b13e5dfd9777a2c09e695f50d181 100755 (executable)
--- 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 4ec533d5e5ff92dd9733ac3a4f4b339e0cf65333..52a437349185c82894456b2dba8376066b370c45 100755 (executable)
--- 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