From b17dfd6392cf3c50e137dba64b0c9e9a9f880990 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sat, 2 Oct 2021 21:52:28 -0700 Subject: [PATCH] fix conflict --- dotfiles/bash/bash_profile | 3 --- dotfiles/bash/bashrc | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile index b37b69d..889b3a6 100644 --- a/dotfiles/bash/bash_profile +++ b/dotfiles/bash/bash_profile @@ -11,9 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then export PATH="/usr/local/opt/tcl-tk/bin:$PATH" 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. export PATH="$PATH:$HOME/.rvm/bin" diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc index c7ba011..105dbd6 100644 --- a/dotfiles/bash/bashrc +++ b/dotfiles/bash/bashrc @@ -70,7 +70,6 @@ weather() { # ------------------ END FUNCTIONS ------------------ # - # ---------------- ALIASES ----------------# # Useful global functions @@ -141,6 +140,14 @@ if which go > /dev/null; then export GOPATH=$HOME/projects/go; fi # ----------------------------------------- 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 eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)"