aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-09-18 12:14:19 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-09-18 12:14:19 -0300
commit8d8ceaebb92cb5036c81cc39f711ce72bb942a8d (patch)
tree6e290ea25ed45d95a9d0be3a8b6602563f2582e7 /share
parentb5269ea9c2c88f6e12688280dd0dd92eb99716f3 (diff)
downloadkeyringer-8d8ceaebb92cb5036c81cc39f711ce72bb942a8d.tar.gz
keyringer-8d8ceaebb92cb5036c81cc39f711ce72bb942a8d.tar.bz2
Testing $RECIPIENT existence at keyringer_set_env
Diffstat (limited to 'share')
-rwxr-xr-xshare/keyringer/append3
-rwxr-xr-xshare/keyringer/edit3
-rwxr-xr-xshare/keyringer/encrypt3
-rwxr-xr-xshare/keyringer/recipients3
-rwxr-xr-xshare/keyringer/recrypt5
5 files changed, 1 insertions, 16 deletions
diff --git a/share/keyringer/append b/share/keyringer/append
index 1e91d6f..fbfe49f 100755
--- a/share/keyringer/append
+++ b/share/keyringer/append
@@ -14,9 +14,6 @@ FILE="`keyringer_filename $2`"
if [ -z "$FILE" ]; then
echo "Usage: keyringer <keyring> `basename $0` <file>"
exit 1
-elif [ ! -f "$RECIPIENTS" ]; then
- echo "No recipient config was found"
- exit 1
elif [ ! -f "$KEYDIR/$FILE" ]; then
echo "File not found: $KEYDIR/$FILE"
exit 1
diff --git a/share/keyringer/edit b/share/keyringer/edit
index 264c75f..dff42e6 100755
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -14,9 +14,6 @@ FILE="`keyringer_filename $2`"
if [ -z "$FILE" ]; then
echo "Usage: keyringer <keyring> `basename $0` <file>"
exit 1
-elif [ ! -f "$RECIPIENTS" ]; then
- echo "No recipient config was found"
- exit 1
elif [ ! -f "$KEYDIR/$FILE" ]; then
echo "File not found: $KEYDIR/$FILE"
exit 1
diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt
index d1218ae..1f0ec47 100755
--- a/share/keyringer/encrypt
+++ b/share/keyringer/encrypt
@@ -15,9 +15,6 @@ FILE="`keyringer_filename $2`"
if [ -z "$FILE" ]; then
echo "Usage: keyringer <keyring> `basename $0` <file>"
exit 1
-elif [ ! -f "$RECIPIENTS" ]; then
- echo "No recipient config was found"
- exit 1
fi
# Encrypt
diff --git a/share/keyringer/recipients b/share/keyringer/recipients
index 7048211..3410b3d 100755
--- a/share/keyringer/recipients
+++ b/share/keyringer/recipients
@@ -14,9 +14,6 @@ COMMAND="$2"
if [ -z "$COMMAND" ]; then
echo "Usage: keyringer <keyring> `basename $0` <command> [arguments]"
exit 1
-elif [ ! -f "$RECIPIENTS" ]; then
- echo "No recipient config was found"
- exit 1
fi
if [ "$COMMAND" == "ls" ]; then
diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index f0e15a3..32a8a39 100755
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -14,10 +14,7 @@ FILE="`keyringer_filename $2`"
if [ -z "$FILE" ]; then
echo "Usage: keyringer <keyring> `basename $0` <file>"
exit 1
-elif [ ! -f "$RECIPIENTS" ]; then
- echo "No recipient config was found"
- exit 1
-elif [ ! -f "$KEYDIR/$FILE" ]; then
+if [ ! -f "$KEYDIR/$FILE" ]; then
echo "File not found: $KEYDIR/$FILE"
exit 1
fi