diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-server | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -73,7 +73,7 @@ file_hash() { # character # FIXME: undo all escape character translation in with-colons gpg output unescape() { - echo "$1" | sed 's/\\x3a/:/' + echo "$1" | sed 's/\\x3a/:/g' } # remove all lines with specified string from specified file diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 9e025f9..d9b8676 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -56,7 +56,7 @@ subcommands: gpg-authentication-cmd CMD gnupg-authentication command - help (h,?) this help + -h|--help|help (h,?) this help EOF } @@ -236,7 +236,7 @@ gen_key() { revoker= # get options - TEMP=$(getopt -o l:e:r: -l length:,expire:,revoker: -n "$PGRM" -- "$@") + TEMP=$(getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@") if [ $? != 0 ] ; then exit 1 @@ -372,10 +372,10 @@ publish_server_key() { # FIXME: need to figure out better way to identify host key # dummy command so as not to publish fakes keys during testing # eventually: - #gpg_authentication "--keyserver $KEYSERVER --send-keys $(hostname -f)" + #gpg_authentication "--keyserver $KEYSERVER --send-keys =ssh://$(hostname -f)" echo "NOT PUBLISHED (to avoid permanent publication errors during monkeysphere development)." echo "The following command should publish the key:" - echo "monkeysphere-server gpg-authentication-cmd '--keyserver $KEYSERVER --send-keys $(hostname -f)'" + echo "monkeysphere-server gpg-authentication-cmd '--keyserver $KEYSERVER --send-keys =ssh://$(hostname -f)'" exit 255 } @@ -712,7 +712,7 @@ case $COMMAND in gpg_authentication_cmd "$@" ;; - 'help'|'h'|'?') + '--help'|'help'|'-h'|'h'|'?') usage ;; |