Browse Source

fix pyenv...again

master
Taylor Bockman 2 years ago
parent
commit
7161bb7736
  1. 15
      dotfiles/zsh/initializations.zsh
  2. 6
      dotfiles/zsh/zprofile

15
dotfiles/zsh/initializations.zsh

@ -1,7 +1,9 @@
#!/bin/zsh #!/bin/zsh
if [[ "$OSTYPE" == "linux-gnu" ]]; then if [[ "$OSTYPE" == "linux-gnu" ]]; then
export PATH="$HOME/.pyenv/bin:$PATH" export PATH=/usr/local/bin:$PATH
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
# For whatever reason the linux version of pyenv doesnt install `pyenv-virtualenv-init`. # For whatever reason the linux version of pyenv doesnt install `pyenv-virtualenv-init`.
eval "$(pyenv init -)" eval "$(pyenv init -)"
@ -9,9 +11,20 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
fi fi
if which pyenv-virtualenv-init > /dev/null; then if which pyenv-virtualenv-init > /dev/null; then
export PATH=/usr/local/bin:$PATH
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)" eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)" eval "$(pyenv virtualenv-init -)"
fi fi
if hash pyenv 2>/dev/null; then
export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
fi
# RVM configuration # RVM configuration
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"

6
dotfiles/zsh/zprofile

@ -13,12 +13,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
export PATH="/usr/local/opt/tcl-tk/bin:$PATH" export PATH="/usr/local/opt/tcl-tk/bin:$PATH"
fi fi
if hash pyenv 2>/dev/null; then
export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
fi
export PATH=$HOME/bin:/usr/local/bin:$PATH export PATH=$HOME/bin:/usr/local/bin:$PATH
test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true

Loading…
Cancel
Save