diff --git a/zshrc b/zshrc index b49443b..23ba631 100644 --- a/zshrc +++ b/zshrc @@ -79,6 +79,8 @@ path=( $HOME/.rbenv/bin $HOME/.rbenv/shims $HOME/.phpenv/bin + $HOME/perl5/bin + $HOME/code/trvs/bin /usr/local/sbin /usr/local/bin /usr/bin/vendor_perl @@ -99,7 +101,7 @@ if which phpenv >/dev/null; then eval "$(phpenv init - 2>/dev/null)" fi -eval "$(gimme 1.8.1)" 2>/dev/null +eval "$(gimme 1.8.3)" 2>/dev/null export GOPATH="$HOME/go" CDPATH="$HOME/code:$HOME/src:$HOME/Development/src:$HOME/repos" @@ -125,13 +127,26 @@ function start-ssh-agent() { ssh-agent >~/.ssh/agent.out } +function __maybesource() { + if [[ -f "${1}" ]]; then + source "${1}" + fi +} load-ssh-agent &>/dev/null -[[ -e ~/.zshenv ]] && source ~/.zshenv +__maybesource ~/.zshenv +__maybesource ~/.travis/travis.sh +__maybesource ~/google-cloud-sdk/path.zsh.inc +__maybesource ~/google-cloud-sdk/completion.zsh.inc +__maybesource /usr/share/nvm/init-nvm.sh + +if [[ -f ~/perl5/lib/perl5/local/lib.pm ]]; then + eval "$(perl -I ~/perl5/lib/perl5 '-Mlocal::lib')" +fi + +if trvs version &>/dev/null; then + eval "$(trvs init -)" +fi -[ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh -[ -f ~/google-cloud-sdk/path.zsh.inc ] && source ~/google-cloud-sdk/path.zsh.inc -[ -f ~/google-cloud-sdk/completion.zsh.inc ] && source ~/google-cloud-sdk/completion.zsh.inc -[ -f /usr/share/nvm/init-nvm.sh ] && source /usr/share/nvm/init-nvm.sh true