From f621aa0bbfb34910136afdea6ed5cd217bdeaff2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 16 May 2014 16:56:53 -0300 Subject: Release workflow with git-flow (2) --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 42f6d9b..c94a4b9 100644 --- a/Makefile +++ b/Makefile @@ -56,9 +56,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 -- cgit v1.2.3 From c2258daf2beb025e599ffaa1cbaf122506953abc Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 20 May 2014 11:56:37 -0300 Subject: Use a custom .vimrc so VIM command line is not messed with quotes (#50) --- ChangeLog | 4 ++++ Makefile | 2 ++ lib/keyringer/editors/vim | 5 +++++ lib/keyringer/functions | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 lib/keyringer/editors/vim (limited to 'Makefile') diff --git a/ChangeLog b/ChangeLog index aa63787..b2e5279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-05-20 - Silvio Rhatto + + Use a custom .vimrc so VIM command line is not messed with quotes (#50) + 2014-05-16 - 0.3.4 - Silvio Rhatto Workaround for open/edit action returning instantaneously (#49) diff --git a/Makefile b/Makefile index c94a4b9..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 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 -- cgit v1.2.3