From 0079a604b0a614af613d0a98dd4920a8ae103a64 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Sat, 12 Sep 2015 22:22:46 +0200
Subject: Fixed the vim function calling itself

---
 bash/.bashrc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 2e6df21..5edd73a 100755
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -89,13 +89,14 @@ elif exists vi; then
 fi
 
 vim() {
+	vim_bin=$(whereis -B $(sed "s/:/ /g" <(echo $PATH)) -b $EDITOR | cut -d' ' -f2-)
 	if [[ -z $@ ]]; then
-		$EDITOR
+		$vim_bin
 	elif [[ -d $@ ]]; then
 		dir=$(pwd)
-		cd $@ && $EDITOR && cd $dir
+		cd $@ && $vim_bin && cd $dir
 	else
-		$EDITOR $@
+		$vim_bin $@
 	fi
 }
 
@@ -166,7 +167,7 @@ fi
 # Start gnome-keyring-daemon
 if exists gnome-keyring-daemon; then
 	if [ -n "$DESKTOP_SESSION" ];then
-		eval $(gnome-keyring-daemon --start)
+		eval $(gnome-keyring-daemon --start 2> /dev/null)
 		export SSH_AUTH_SOCK
 	fi
 fi
-- 
cgit v1.2.3