diff options
author | rhatto <rhatto@ratatosk.fluxo.info> | 2014-03-27 22:03:39 -0300 |
---|---|---|
committer | rhatto <rhatto@ratatosk.fluxo.info> | 2014-03-27 22:03:39 -0300 |
commit | d6119b43f54c53d3fdffd995699337b100eee2c0 (patch) | |
tree | 8035fb337d383585dd88fc3b55de08ce12518572 /lib | |
parent | fc9954384ee5543d742395c5b9245e83d6e9fd07 (diff) | |
download | keyringer-d6119b43f54c53d3fdffd995699337b100eee2c0.tar.gz keyringer-d6119b43f54c53d3fdffd995699337b100eee2c0.tar.bz2 |
Avoid viminfo if VIM is set as $EDITOR (#50)
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/keyringer/actions/edit | 1 | ||||
-rwxr-xr-x | lib/keyringer/functions | 7 |
2 files changed, 8 insertions, 0 deletions
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 |