Merge branch 'release/0.3.5'0.3.5

7 files changed, 23 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index aa63787..4a384b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-20 - 0.3.5 - Silvio Rhatto <rhatto@riseup.net>
+
+	Use a custom .vimrc so VIM command line is not messed with quotes (#50)
+
 2014-05-16 - 0.3.4 - Silvio Rhatto <rhatto@riseup.net>
 
 	Workaround for open/edit action returning instantaneously (#49)
diff --git a/Makefile b/Makefile
index 42f6d9b..7ef6001 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@ install_lib:
 	$(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
 	$(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
 	$(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
+	$(INSTALL) -D --mode=0755 -d lib/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
+	$(INSTALL) -D --mode=0755 lib/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
 
 install_bin:
 	$(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
@@ -56,9 +58,12 @@ tarball:
 release:
 	@make build_man
 	git commit -a -m "Keyringer $(VERSION)"
+	git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION)
+	git checkout master
 	@make tarball
 	gpg --use-agent --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2
 	scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/
 	# We're doing tagging afterwards:
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375
-	git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+	#git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+	git checkout develop
diff --git a/development.mdwn b/development.mdwn
index 67c6456..3857b3a 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -54,7 +54,6 @@ Release workflow
 
 Go to develop branch and start a new release
 
-    git checkout develop
     git flow release start VERSION
 
 Prepare the source code:
@@ -65,8 +64,6 @@ Prepare the source code:
 
 Create and upload a new release:
 
-    git flow release finish $VERSION
-    git checkout master
     make release
 
 Update the debian branch:
diff --git a/keyringer b/keyringer
index e1f405f..f29b36a 100755
--- a/keyringer
+++ b/keyringer
@@ -138,7 +138,7 @@ function keyringer_dispatch {
 
 # Config
 NAME="keyringer"
-KEYRINGER_VERSION="0.3.4"
+KEYRINGER_VERSION="0.3.5"
 CONFIG_VERSION="0.1"
 CONFIG_BASE="$HOME/.$NAME"
 CONFIG="$CONFIG_BASE/config"
diff --git a/lib/keyringer/actions/edit b/lib/keyringer/actions/edit
index 3ccf977..a5f14d4 100755
--- a/lib/keyringer/actions/edit
+++ b/lib/keyringer/actions/edit
@@ -36,9 +36,12 @@ elif [ "$BASENAME" == "open" ]; then
   fi
 fi
 
+# Set APPNAME
+APPNAME="`echo $APP | awk '{ print $1 }'`"
+
 # 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 or files"
+echo "Press any key to open the decrypted data with $APPNAME, Ctrl-C to abort"
+echo "WARNING: please make sure that $APPNAME doesn't leak data to external applications or files"
 echo "Press ENTER to continue"
 read -s key
 $APP "$TMPWORK"
@@ -53,7 +56,7 @@ wait
 # Thus, we cannot just wipe the file and exit keyringer, as the user might have a buffered copy
 # of the unencrypted file in the application, which can lead to information leakage if the user
 # saves the file and leaves the editor.
-echo "Press any key when done using the file and you're sure that $APP is closed."
+echo "Press any key when done using the file and you're sure that $APPNAME is closed."
 read -s -n 1
 
 # Encrypt again
diff --git a/lib/keyringer/editors/vim b/lib/keyringer/editors/vim
new file mode 100644
index 0000000..0f877df
--- /dev/null
+++ b/lib/keyringer/editors/vim
@@ -0,0 +1,5 @@
+" Use sane defaults for VIM to avoid data leakage
+" See https://keyringer.pw/trac/ticket/50
+set nowritebackup
+set nobackup
+set viminfo="NONE"
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 50d01db..fdd8439 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -287,7 +287,7 @@ function keyringer_set_env {
   # 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 '+set nowritebackup' '+set nobackup'"
+      EDITOR="$EDITOR -S `dirname $LIB`/editors/vim"
     fi
   fi