aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-05-13 11:20:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-05-13 11:20:46 -0300
commit5e0c763915d359c7292e5751a46554656a0cb164 (patch)
tree2b89e9b21de230032669ffdd87b84f54bf91a4c2 /share
parent6216f846f8b9a6d6f631e3b827b466a14aae0ac8 (diff)
downloadkeyringer-5e0c763915d359c7292e5751a46554656a0cb164.tar.gz
keyringer-5e0c763915d359c7292e5751a46554656a0cb164.tar.bz2
Text fixes
Diffstat (limited to 'share')
-rwxr-xr-xshare/keyringer/edit2
-rwxr-xr-xshare/keyringer/genpair8
2 files changed, 5 insertions, 5 deletions
diff --git a/share/keyringer/edit b/share/keyringer/edit
index 0c25f64..47945f3 100755
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -20,7 +20,7 @@ keyringer_set_tmpfile edit
gpg --yes -o "$TMPWORK" --use-agent -d "$KEYDIR/$FILE"
# Prompt
-echo "Press any key to open the decrypted data into $EDITOR, Ctrl-C to abort"
+echo "Press any key to open the decrypted data in $EDITOR, Ctrl-C to abort"
read key
"$EDITOR" "$TMPWORK"
diff --git a/share/keyringer/genpair b/share/keyringer/genpair
index cffed94..065111e 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"