From 896a27c897e7edef0246a3ff4a7675f7fc207489 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 3 Jan 2015 16:29:06 +0100 Subject: [PATCH 1/3] gitconfig: credential.helper --- .gitignore | 1 + gitconfig => gitconfig.m4 | 2 ++ 2 files changed, 3 insertions(+) rename gitconfig => gitconfig.m4 (57%) diff --git a/.gitignore b/.gitignore index 4c2a1cf..248bc3a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ procmailrc .*.swp *~ *.pyc +gitconfig diff --git a/gitconfig b/gitconfig.m4 similarity index 57% rename from gitconfig rename to gitconfig.m4 index d2895b6..6a2922d 100644 --- a/gitconfig +++ b/gitconfig.m4 @@ -8,3 +8,5 @@ diff = auto [push] default = simple +[credential] + helper = syscmd(`find /usr/share/git /usr/share/doc/git -name git-credential-gnome-keyring') From 3f61b54a53b3c9d3d02eaee9c38a7fe827d0c210 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 3 Jan 2015 16:29:22 +0100 Subject: [PATCH 2/3] Clean up Makefile. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 571d884..7b37b65 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,7 @@ install-vim-plug: else -install-conf: $(FILES) - mkdir -p ~/.ssh +install-conf: $(FILES) $(FILES2) for i in $(FILES); do install -m0644 $$i ~/.$$i; done for i in $(FILES2); do install -m0600 $$i ~/.$$i; done From dd536c73d4bad2b01842e6d0054fde4277cb78f8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 3 Jan 2015 16:31:35 +0100 Subject: [PATCH 3/3] Make Makefile work under windows. --- Makefile | 2 +- commonshrc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7b37b65..a568535 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifeq ($(OS),Windows_NT) HOME = $(HOMEDRIVE)$(HOMEPATH) -install-conf: +install-conf: $(FILES) $(FILES2) cp gitconfig $(HOME)\.gitconfig cp vimrc $(HOME)\_vimrc cp gvimrc $(HOME)\_gvimrc diff --git a/commonshrc b/commonshrc index 054f667..177f274 100644 --- a/commonshrc +++ b/commonshrc @@ -75,3 +75,6 @@ test -x /usr/bin/vim && alias vi=vim passc() { pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c) } + + +add_to PATH /opt/ghc/7.8.3/bin