summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrhatto@riseup.net <Silvio Rhatto>2014-04-11 15:45:04 -0300
committerrhatto@riseup.net <Silvio Rhatto>2014-04-11 15:45:04 -0300
commit3c06f7b7a2a8fa6577df7b224e334ca831562798 (patch)
tree23d1aff5164c0bd5af914958318034df05739498 /lib
parent14af076627a25b52ca1761c13e9da824db1bcdae (diff)
downloadkeyringer-3c06f7b7a2a8fa6577df7b224e334ca831562798.tar.gz
keyringer-3c06f7b7a2a8fa6577df7b224e334ca831562798.tar.bz2
Use 'encrypt' on edit action and new env variable KEYRINGER_ADD_EXTENSION
Diffstat (limited to 'lib')
-rwxr-xr-xlib/keyringer/actions/edit3
-rwxr-xr-xlib/keyringer/actions/encrypt4
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/keyringer/actions/edit b/lib/keyringer/actions/edit
index ff220a1..2267f37 100755
--- a/lib/keyringer/actions/edit
+++ b/lib/keyringer/actions/edit
@@ -43,7 +43,8 @@ read key
$APP "$TMPWORK"
# Encrypt again
-$GPG --yes -o "$KEYDIR/$FILE" --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS_FILE") "$TMPWORK"
+export KEYRINGER_ADD_EXTENSION=false
+keyringer_exec encrypt "$BASEDIR" "$FILE" "$TMPWORK"
# Check exit status
errcrypt="$?"
diff --git a/lib/keyringer/actions/encrypt b/lib/keyringer/actions/encrypt
index e9bf453..7415267 100755
--- a/lib/keyringer/actions/encrypt
+++ b/lib/keyringer/actions/encrypt
@@ -57,9 +57,11 @@ if [ ! -z "$3" ]; then
#
# Useful when opening files and the application needs the
# extension to guess the file type.
- if ! echo $BASEPATH | grep -q -e "\.$EXTENSION$"; then
+ if [ "$KEYRINGER_ADD_EXTENSION" != "false" ] && ! echo $BASEPATH | grep -q -e "\.$EXTENSION$"; then
echo "Appending '$EXTENSION' into secret name..."
FILE="$BASEPATH.$EXTENSION"
+ else
+ FILE="$BASEPATH"
fi
else
FILE="$BASEPATH"