diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | lib/keyringer/actions/edit | 1 | ||||
| -rwxr-xr-x | lib/keyringer/functions | 7 |
3 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2014-03-27 - Silvio Rhatto <rhatto@riseup.net> + + Avoid viminfo if VIM is set as $EDITOR (#50) + 2014-03-22 - 0.3.3 - Silvio Rhatto <rhatto@riseup.net> Use --recv-keys instead of --refresh-keys diff --git a/lib/keyringer/actions/edit b/lib/keyringer/actions/edit index 03ccdab..ff220a1 100755 --- a/lib/keyringer/actions/edit +++ b/lib/keyringer/actions/edit @@ -38,6 +38,7 @@ fi # Prompt echo "Press any key to open the decrypted data with $APP, Ctrl-C to abort" +echo "WARNING: please make sure that $APP doesn't leak data to external applications os files" read key $APP "$TMPWORK" diff --git a/lib/keyringer/functions b/lib/keyringer/functions index f1af951..af300ef 100755 --- a/lib/keyringer/functions +++ b/lib/keyringer/functions @@ -284,6 +284,13 @@ function keyringer_set_env { fi fi + # Avoid viminfo, see https://keyringer.pw/trac/ticket/50 + if $EDITOR --help | grep -q -e "^VIM"; then + if ! echo $EDITOR | grep -q -- "-i NONE"; then + EDITOR="$EDITOR -i NONE" + fi + fi + if [ ! -f "$OPTIONS" ]; then echo "No option config was found" exit 1 |