X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=a25fd6a64257a780fc6628842f119218a1f198ee;hb=5fadec09dcd44c4dcad657a0f3d96878b592b77b;hp=59b7e4a2464746bc4eaf8a6fa5896bade7fe223d;hpb=c8b42c1d77005ab3f41d20cc2524f4307086ec4f;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 59b7e4a..a25fd6a 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -22,7 +22,7 @@ DATE=$(date -u '+%FT%T')
 unset GREP_OPTIONS
 
 # default return code
-ERR=0
+RETURN=0
 
 ########################################################################
 # FUNCTIONS
@@ -30,7 +30,7 @@ ERR=0
 
 usage() {
 cat <<EOF
-usage: $PGRM <subcommand> [args]
+usage: $PGRM <subcommand> [options] [args]
 MonkeySphere client tool.
 
 subcommands:
@@ -208,7 +208,7 @@ case $COMMAND in
         # those hosts
 	if [ "$1" ] ; then
 	    update_known_hosts "$@"
-	    ERR="$?"
+	    RETURN="$?"
 
         # otherwise, if no hosts are specified, process every host
         # in the user's known_hosts file
@@ -218,7 +218,7 @@ case $COMMAND in
 	    fi
 
 	    process_known_hosts
-	    ERR="$?"
+	    RETURN="$?"
 	fi
 	;;
 
@@ -232,7 +232,7 @@ case $COMMAND in
 
 	# process authorized_user_ids file
 	process_authorized_user_ids "$AUTHORIZED_USER_IDS"
-	ERR="$?"
+	RETURN="$?"
 	;;
 
     'gen-subkey'|'g')
@@ -253,4 +253,4 @@ Type '$PGRM help' for usage."
         ;;
 esac
 
-exit "$ERR"
+exit "$RETURN"