aboutsummaryrefslogtreecommitdiff
path: root/share/keyringer/edit
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-09-18 13:50:04 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-09-18 13:50:04 -0300
commitd32faa9d6cddbc714de708ecc052b43b49d7faa8 (patch)
tree4572b4fd1509531c0b0ec013d0eccaaff8412c00 /share/keyringer/edit
parent43235df8406f6e8e400de502d36b9fa46de12756 (diff)
downloadkeyringer-d32faa9d6cddbc714de708ecc052b43b49d7faa8.tar.gz
keyringer-d32faa9d6cddbc714de708ecc052b43b49d7faa8.tar.bz2
Fixing tmpfile handling
Diffstat (limited to 'share/keyringer/edit')
-rwxr-xr-xshare/keyringer/edit11
1 files changed, 5 insertions, 6 deletions
diff --git a/share/keyringer/edit b/share/keyringer/edit
index edeb693..4a5be14 100755
--- a/share/keyringer/edit
+++ b/share/keyringer/edit
@@ -15,19 +15,18 @@ keyringer_get_file $2
echo "Make sure that $BASEDIR is atop of an encrypted volume."
# Set a tmp file
-TMPFILE="`keyringer_set_tmpfile edit`"
-trap "keyringer_unset_tmpfile $TMPFILE ; exit" INT TERM EXIT
+keyringer_set_tmpfile edit
# Decrypt the information to the file
-gpg --yes -o $TMPFILE --use-agent -d $KEYDIR/$FILE
+gpg --yes -o $TMPWORK --use-agent -d $KEYDIR/$FILE
# Prompt
echo "Press any key to open the decrypted data into $EDITOR, Ctrl-C to abort"
read key
-$EDITOR $TMPFILE
+$EDITOR $TMPWORK
# Encrypt again
-gpg --yes -o $KEYDIR/$FILE --use-agent --armor -e -s $(keyringer_recipients $RECIPIENTS) $TMPFILE
+gpg --yes -o $KEYDIR/$FILE --use-agent --armor -e -s $(keyringer_recipients $RECIPIENTS) $TMPWORK
# Remove temp file
-keyringer_unset_tmpfile $TMPFILE
+keyringer_unset_tmpfile $TMPWORK