From c796d9f1d93931d15492d289b9ac54344315d3f3 Mon Sep 17 00:00:00 2001 From: Robin Wenglewski Date: Fri, 30 Dec 2011 03:35:03 +0100 Subject: [PATCH] remove rvm, dont source profile --- Rakefile | 1 + config.zsh | 4 ---- zshenv | 1 + zshrc | 3 ++- 4 files changed, 4 insertions(+), 5 deletions(-) create mode 100755 zshenv diff --git a/Rakefile b/Rakefile index df364ad08..df6411321 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,4 @@ task :setup do %x(ln -sf ~/.zsh/zshrc ~/.zshrc) + %x(ln -sf ~/.zsh/zshenv ~/.zshenv) end \ No newline at end of file diff --git a/config.zsh b/config.zsh index e355accb6..730ae3264 100644 --- a/config.zsh +++ b/config.zsh @@ -74,7 +74,3 @@ unsetopt EXTENDED_HISTORY # add timestamps to history # ctrl-< and crtrl-> still works export DISABLE_AUTO_UPDATE=true - -# rvm, should be at the end of this config file -[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # This loads RVM into a shell session. - diff --git a/zshenv b/zshenv new file mode 100755 index 000000000..73725a005 --- /dev/null +++ b/zshenv @@ -0,0 +1 @@ +eval "$(rbenv init -)" \ No newline at end of file diff --git a/zshrc b/zshrc index 77bc5eb28..9ee6b158a 100755 --- a/zshrc +++ b/zshrc @@ -1,6 +1,7 @@ # source global profile if exists. This is important, since in /etc/profile the /etc/profile.d/* files are sourced. # These usually contain additional path variables and other global settings -[[ -f /etc/profile ]] && . /etc/profile +# on the other hand, when I source this the path i set in zshenv seems to be overriden +# [[ -f /etc/profile ]] && . /etc/profile # Path to your oh-my-zsh configuration. ZSH=$HOME/.zsh