Browse Source

fix conflict

master
Taylor Bockman 3 years ago
parent
commit
b17dfd6392
  1. 3
      dotfiles/bash/bash_profile
  2. 9
      dotfiles/bash/bashrc

3
dotfiles/bash/bash_profile

@ -11,9 +11,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 [[ "$OSTYPE" == "linux-gnu" ]]; then
export PATH="$HOME/.pyenv/bin:$PATH"
fi
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
export PATH="$PATH:$HOME/.rvm/bin" export PATH="$PATH:$HOME/.rvm/bin"

9
dotfiles/bash/bashrc

@ -70,7 +70,6 @@ weather() {
# ------------------ END FUNCTIONS ------------------ # # ------------------ END FUNCTIONS ------------------ #
# ---------------- ALIASES ----------------# # ---------------- ALIASES ----------------#
# Useful global functions # Useful global functions
@ -141,6 +140,14 @@ if which go > /dev/null; then export GOPATH=$HOME/projects/go; fi
# ----------------------------------------- INITIALIZATIONS -------------------------------------- # # ----------------------------------------- INITIALIZATIONS -------------------------------------- #
if [[ "$OSTYPE" == "linux-gnu" ]]; then
export PATH="$HOME/.pyenv/bin:$PATH"
# For whatever reason the linux version of pyenv doesnt install `pyenv-virtualenv-init`.
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
fi
if which pyenv-virtualenv-init > /dev/null; then if which pyenv-virtualenv-init > /dev/null; then
eval "$(pyenv init -)" eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)" eval "$(pyenv virtualenv-init -)"

Loading…
Cancel
Save