diff options
| author | Matt Goins <mjgoins@openflows.com> | 2009-01-31 18:32:12 -0500 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2009-01-31 18:32:12 -0500 |
| commit | 26bdfd9c0aa0853ca1ea80e1980e7e9849646e10 (patch) | |
| tree | 1a92ec7a3cc4df963bf8d3df82115c39ea4fe031 /src/subcommands/mh | |
| parent | 53f4ee78f320371a0f07865b21fdb4d6707a79d6 (diff) | |
| parent | 7d4b4815db8ba2f6f984a18a90b50032cf9158ba (diff) | |
Merge commit 'dkg/master'
Conflicts:
src/monkeysphere-host
Diffstat (limited to 'src/subcommands/mh')
| -rwxr-xr-x | src/subcommands/mh/gen-key | 6 | ||||
| -rwxr-xr-x | src/subcommands/mh/import-key | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key index 9f26087..8558441 100755 --- a/src/subcommands/mh/gen-key +++ b/src/subcommands/mh/gen-key @@ -27,10 +27,6 @@ fingerprint_server_key >/dev/null \ # get options while true ; do case "$1" in - -h|--hostname) - hostName="$2" - shift 2 - ;; -l|--length) keyLength="$2" shift 2 @@ -44,6 +40,8 @@ while true ; do failure "Unknown option '$1'. Type '$PGRM help' for usage." fi + hostName="$1" + shift; break ;; esac diff --git a/src/subcommands/mh/import-key b/src/subcommands/mh/import-key index d60e982..ac67711 100755 --- a/src/subcommands/mh/import-key +++ b/src/subcommands/mh/import-key @@ -23,10 +23,6 @@ fingerprint_server_key >/dev/null \ # get options while true ; do case "$1" in - -h|--hostname) - hostName="$2" - shift 2 - ;; -f|--keyfile) keyFile="$2" shift 2 @@ -40,6 +36,9 @@ while true ; do failure "Unknown option '$1'. Type '$PGRM help' for usage." fi + hostName="$1" + shift + ;; break ;; esac |