Taking into account .asc extension in recipient files

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 8166370d4dd5780c83fc04123519c18f18d8e47a..04807e66be058380919f4451581e7648c8cb14d8 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -369,6 +369,7 @@ function keyringer_set_recipients {
     keyringer_set_default_recipients
   else
     candidate="$1"
+    candidate_no_extension="`echo $1 | sed -e 's/.asc$//'`"
 
     # Find the first matching recipient
     while [ ! -z "$candidate" ] && [ "$candidate" != "." ] && [ "$candidate" != "/" ]; do
@@ -376,6 +377,10 @@ function keyringer_set_recipients {
         RECIPIENTS_FILE="$RECIPIENTS/$candidate"
         RECIPIENTS_FILE_BASE="$RECIPIENTS_BASE/$candidate"
         return
+      elif [ -e "$RECIPIENTS/$candidate_no_extension" ]; then
+        RECIPIENTS_FILE="$RECIPIENTS/$candidate_no_extension"
+        RECIPIENTS_FILE_BASE="$RECIPIENTS_BASE/$candidate_no_extension"
+        return
       fi
 
       candidate="`dirname $candidate`"