Its more useful and standard to actually output the 'help' output when

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 94279f4092abe234536b19abad44be68a7b0158a..14d2bf042593f9ae1f8995a57cbbcf7bf40c33ce 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -194,20 +194,10 @@ if [ -z "$KEYSERVER" ] ; then
     fi
 fi
 PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT}
-# check the known_hosts file
-if [ "$MONKEYSPHERE_KNOWN_HOSTS" ] ; then
-    if [ -f "$MONKEYSPHERE_KNOWN_HOSTS" ] ; then
-       KNOWN_HOSTS="$MONKEYSPHERE_KNOWN_HOSTS"
-    else
-       failure "specified monkeysphere known_hosts file '$MONKEYSPHERE_KNOWN_HOSTS' does not exist."
-    fi
-fi
-[ -d $(dirname "$KNOWN_HOSTS") ] \
-    || mkdir -m 0700 $(dirname "$KNOWN_HOSTS")
-[ -f "$KNOWN_HOSTS" ] \
-    || touch "$KNOWN_HOSTS"
+KNOWN_HOSTS=${MONKEYSPHERE_KNOWN_HOSTS:=$KNOWN_HOSTS}
 HASH_KNOWN_HOSTS=${MONKEYSPHERE_HASH_KNOWN_HOSTS:=$HASH_KNOWN_HOSTS}
 AUTHORIZED_KEYS=${MONKEYSPHERE_AUTHORIZED_KEYS:=$AUTHORIZED_KEYS}
+STRICT_MODES=${MONKEYSPHERE_STRICT_MODES:=$STRICT_MODES}
 
 # other variables not in config file
 AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:="${MONKEYSPHERE_HOME}/authorized_user_ids"}
@@ -222,10 +212,11 @@ LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX='ms: '}
 export GNUPGHOME
 mkdir -p -m 0700 "$GNUPGHOME"
 export LOG_LEVEL
+export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+[ "$COMMAND" ] || $PGRM help
 shift
 
 case $COMMAND in