Decrypt/encrypt approach (#6)

diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index 695e789d5aab2d5ac2db3682d04272ff2aec6045..9153456963d2a4a40c877efaa54ffadaffd654bf 100755 (executable)
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -14,16 +14,23 @@ function keyringer_recrypt {
   # Set recipients file
   keyringer_set_recipients "$FILE"
 
-  # Set pipefail so we can detect decryption failures
-  set -o pipefail
+  # Decrypt
+  decrypted="$($GPG --use-agent -d "$KEYDIR/$FILE" 2> /dev/null)"
+
+  if [ "$?" != "0" ]; then
+    echo "Decryption error."
+    exit 1
+  fi
 
   # Recrypt
-  $GPG --use-agent -d "$KEYDIR/$FILE" | \
-  $GPG --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS_FILE") > "$KEYDIR/$FILE"
+  echo "$decrypted" | $GPG --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS_FILE") > "$KEYDIR/$FILE"
 
   if [ "$?" != "0" ]; then
+    echo "Recryption error."
     exit 1
   fi
+
+  unset decrypted
 }
 
 if [ ! -z "$2" ]; then