From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 18 Mar 2013 21:04:38 +0000 (-0300)
Subject: Pipefail approach (#6)
X-Git-Tag: 0.2.1~45
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7423fcdcbbe586d2e6b6b675dbaff8a7a7bf7d0f;p=keyringer.git

Pipefail approach (#6)
---

diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index fc16603..695e789 100755
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -14,18 +14,12 @@ function keyringer_recrypt {
   # Set recipients file
   keyringer_set_recipients "$FILE"
 
-  # Test decryption
-  $GPG --use-agent -d "$KEYDIR/$FILE" > /dev/null
-
-  err="$?"
-
-  if [ "$err" != "0" ]; then
-    echo "$BASENAME: decryption failed. Can't recrypt."
-    exit "$err"
-  fi
+  # Set pipefail so we can detect decryption failures
+  set -o pipefail
 
   # Recrypt
-  $GPG --use-agent -d "$KEYDIR/$FILE" | $GPG --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS_FILE") > "$KEYDIR/$FILE"
+  $GPG --use-agent -d "$KEYDIR/$FILE" | \
+  $GPG --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS_FILE") > "$KEYDIR/$FILE"
 
   if [ "$?" != "0" ]; then
     exit 1