Usage fix (2)

diff --git a/share/keyringer/decrypt b/share/keyringer/decrypt
index c799b7f2e481d82193d5b421b90a80458c6ca30f..95ea33293927410c0fc6962c166f3b39d0dea7b4 100755 (executable)
--- a/share/keyringer/decrypt
+++ b/share/keyringer/decrypt
@@ -13,7 +13,7 @@ KEYDIR="$BASEDIR/keys"
 BASENAME="`basename $0`"
 
 if [ -z "$FILE" ]; then
-  echo "Usage: keyringer `basename $0` <file>"
+  echo "Usage: keyringer <keyring> `basename $0` <file>"
   exit 1
 elif [ ! -f "$KEYDIR/$FILE" ]; then
   echo "File not found: $KEYDIR/$FILE"

diff --git a/share/keyringer/del b/share/keyringer/del
index c53143a1b5e7979f7f4c24a11dc76db21c60a8a6..e032b7c69dc1086166f3238ed2aadd692de49f8a 100755 (executable)
--- a/share/keyringer/del
+++ b/share/keyringer/del
@@ -15,7 +15,7 @@ BASENAME="`basename $0`"
 
 # Setup
 if [ -z "$FILE" ]; then
-  echo "Usage: keyringer `basename $0` <file>"
+  echo "Usage: keyringer <keyring> `basename $0` <file>"
   exit 1
 elif [ ! -f "$KEYDIR/$FILE" ]; then
   echo "File not found: $KEYDIR/$FILE"

diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt
index a3272d2b5565c2cd9a4e4fd87312bff750080382..ba3d2d00093a259f8383280c2d8d8e59d77ac758 100755 (executable)
--- a/share/keyringer/encrypt
+++ b/share/keyringer/encrypt
@@ -17,7 +17,7 @@ BASENAME="`basename $0`"
 
 # Setup
 if [ -z "$FILE" ]; then
-  echo "Usage: keyringer `basename $0` <file>"
+  echo "Usage: keyringer <keyring> `basename $0` <file>"
   exit 1
 elif [ ! -f "$RECIPIENTS" ]; then
   echo "No recipient config was found"

diff --git a/share/keyringer/genpair b/share/keyringer/genpair
index 9d5ccd3d31017535d66950b8f507b228bbce933a..95cb061f29968f4fbba7f74fa13e39ee9b930858 100755 (executable)
--- a/share/keyringer/genpair
+++ b/share/keyringer/genpair
@@ -96,7 +96,7 @@ CWD="`pwd`"
 
 # Verify
 if [ -z "$NODE" ]; then
-  echo "Usage: keyringer $BASENAME <gpg|ssh|ssl> <file> <hostname>"
+  echo "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl> <file> <hostname>"
   exit 1
 elif [ ! -e "$KEYDIR" ]; then
   echo "Folder not found: $KEYDIR, leaving"

diff --git a/share/keyringer/git b/share/keyringer/git
index b8df304d9264cba8139f2edecc631c18fa7a2af0..67d4d0f31fb5cd83aa89d88783f2e47053fb28fb 100755 (executable)
--- a/share/keyringer/git
+++ b/share/keyringer/git
@@ -7,7 +7,7 @@ BASEDIR="$1"
 CWD="`pwd`"
 
 if [ -z "$BASEDIR" ]; then
-  echo "Usage: keyringer `basename $0` [arguments]"
+  echo "Usage: keyringer <keyringer> `basename $0` [arguments]"
   exit 1
 fi
 

diff --git a/share/keyringer/ls b/share/keyringer/ls
index 53b418d054d257e6797774966c37b96500a01779..418babb80fdb097bb4fc4e08b65d96d7cc628669 100755 (executable)
--- a/share/keyringer/ls
+++ b/share/keyringer/ls
@@ -8,7 +8,7 @@ KEYDIR="$BASEDIR/keys"
 CWD="`pwd`"
 
 if [ -z "$KEYDIR" ]; then
-  echo "Usage: keyringer `basename $0` [arguments]"
+  echo "Usage: keyringer <keyring> `basename $0` [arguments]"
   exit 1
 fi
 

diff --git a/share/keyringer/recipients b/share/keyringer/recipients
index c0a4a65c16b55248b427e3bf30d15a90d18ad1c4..46eb9692281cd790feb35b921300039bc981ee41 100755 (executable)
--- a/share/keyringer/recipients
+++ b/share/keyringer/recipients
@@ -10,7 +10,7 @@ BASENAME="`basename $0`"
 RECIPIENTS="$BASEDIR/config/recipients"
 
 if [ -z "$COMMAND" ]; then
-  echo "Usage: keyringer `basename $0` <command> [arguments]"
+  echo "Usage: keyringer <keyring> `basename $0` <command> [arguments]"
   exit 1
 elif [ ! -f "$RECIPIENTS" ]; then
   echo "No recipient config was found"

diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index 6b26469d96fe39147eac983a4221b8470998b4d6..1b3522467ad780637497bd816e2ec252e61f9be0 100755 (executable)
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -15,7 +15,7 @@ RECIPIENTS="$BASEDIR/config/recipients"
 BASENAME="`basename $0`"
 
 if [ -z "$FILE" ]; then
-  echo "Usage: keyringer `basename $0` <file>"
+  echo "Usage: keyringer <keyring> `basename $0` <file>"
   exit 1
 elif [ ! -f "$RECIPIENTS" ]; then
   echo "No recipient config was found"