From: rhatto <rhatto@ratatosk.fluxo.info>
Date: Fri, 28 Mar 2014 01:03:39 +0000 (-0300)
Subject: Avoid viminfo if VIM is set as $EDITOR (#50)
X-Git-Tag: 0.3.4~18
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d6119b43f54c53d3fdffd995699337b100eee2c0;p=keyringer.git

Avoid viminfo if VIM is set as $EDITOR (#50)
---

diff --git a/ChangeLog b/ChangeLog
index 5b1c53e..736bff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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