diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-05-13 11:24:58 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-05-13 11:24:58 -0300 |
| commit | fbe4d5b07707dc6084c373bdc11ecb2546f96e53 (patch) | |
| tree | 49fa69fd1d04abf54b629d08d8fd5f25a608ca7f /share/keyringer/genpair | |
| parent | a7307e0384acfdac2cbf27322e5da257f4efc0ec (diff) | |
| parent | 5e0c763915d359c7292e5751a46554656a0cb164 (diff) | |
| download | keyringer-fbe4d5b07707dc6084c373bdc11ecb2546f96e53.tar.gz keyringer-fbe4d5b07707dc6084c373bdc11ecb2546f96e53.tar.bz2 | |
Merge branches 'master' and 'ruby' into ruby
Diffstat (limited to 'share/keyringer/genpair')
| -rwxr-xr-x | share/keyringer/genpair | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/keyringer/genpair b/share/keyringer/genpair index d0d7382..405dd9e 100755 --- a/share/keyringer/genpair +++ b/share/keyringer/genpair @@ -156,10 +156,10 @@ CWD="`pwd`" if [ -z "$NODE" ]; then echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl|ssl-cacert|ssl-self> <file> <hostname> [outfile]" echo -e "Options:" - echo -e "\t gpg|ssh|ssl: key type." - echo -e "\t file : base file name for encrypted output (relative to keys folder)" - echo -e "\t hostname : host for the key pair" - echo -e "\t outfile : optional unencrypted output file, useful for deployment" + echo -e "\t gpg|ssh|ssl[-cacert,-self]: key type." + echo -e "\t file : base file name for encrypted output (relative to keys folder)" + echo -e "\t hostname : host for the key pair" + echo -e "\t outfile : optional unencrypted output file, useful for deployment" exit 1 elif [ ! -e "$KEYDIR" ]; then echo "Folder not found: $KEYDIR, leaving" |