forked from colonelpanic/dotfiles
Don't run path helper if its alredy been run
Also run it before setup_env
This commit is contained in:
parent
69b5d24787
commit
5357c25713
@ -40,8 +40,6 @@ function _setup_env {
|
|||||||
# Load RVM into a shell session *as a function*
|
# Load RVM into a shell session *as a function*
|
||||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
|
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
|
||||||
|
|
||||||
_source_shellenv_files
|
|
||||||
|
|
||||||
function with_shellrc {
|
function with_shellrc {
|
||||||
zsh -c "source ~/.zshrc && ""$@"
|
zsh -c "source ~/.zshrc && ""$@"
|
||||||
}
|
}
|
||||||
@ -49,9 +47,6 @@ function _setup_env {
|
|||||||
# Travis completion
|
# Travis completion
|
||||||
[ -f "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
|
[ -f "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
|
||||||
|
|
||||||
test -e /usr/libexec/path_helper && eval `/usr/libexec/path_helper -s`
|
|
||||||
|
|
||||||
|
|
||||||
export NVM_DIR="/Users/imalison/.nvm"
|
export NVM_DIR="/Users/imalison/.nvm"
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
export NODE_PATH="/usr/local/lib/node_modules/"
|
export NODE_PATH="/usr/local/lib/node_modules/"
|
||||||
@ -66,8 +61,11 @@ function _setup_env {
|
|||||||
export ENVIRONMENT_SETUP_DONE="$(date)"
|
export ENVIRONMENT_SETUP_DONE="$(date)"
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ -z ${ENVIRONMENT_SETUP_DONE+x} ]; then
|
function _path_helper {
|
||||||
_setup_env
|
export PATH_HELPER_RAN="$(date)"
|
||||||
else
|
eval `/usr/libexec/path_helper -s`
|
||||||
_source_shellenv_files
|
}
|
||||||
fi
|
|
||||||
|
environment_variable_exists PATH_HELPER_RAN || _path_helper
|
||||||
|
environment_variable_exists ENVIRONMENT_SETUP_DONE || _setup_env
|
||||||
|
_source_shellenv_files
|
||||||
|
Loading…
Reference in New Issue
Block a user