From cff73794dc6c92da033b4a0eb87ee9451373663f Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 22 Jul 2023 14:59:10 +0300 Subject: [PATCH] Moved pyenv config from `.profile` to `.bashrc` Shell integration should be configured in every interactive shell. --- .bashrc | 16 ++++++++++++---- .profile | 10 +++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.bashrc b/.bashrc index f516a37..a9ac99d 100644 --- a/.bashrc +++ b/.bashrc @@ -170,10 +170,18 @@ if type -p pip >/dev/null 2>&1 || type -p pip3 >/dev/null 2>&1; then complete -F _pip_completion_loader pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11 fi -#if which pyenv >/dev/null 2>&1; then -# eval "`pyenv init -`" -# eval "`pyenv virtualenv-init -`" -#fi +if test -d "$HOME"/.pyenv +then + PYENV_ROOT="$HOME"/.pyenv + export PYENV_ROOT + PATH="$PYENV_ROOT/bin:$PATH" + if which pyenv >/dev/null 2>&1; then +# eval "`pyenv init --path`" + eval "`pyenv init -`" + eval "`pyenv virtualenv-init -`" + fi +fi + . virtualenvwrapper_lazy.sh 2>/dev/null diff --git a/.profile b/.profile index 7e6ba5a..45b4a56 100644 --- a/.profile +++ b/.profile @@ -146,6 +146,9 @@ if [ -t 0 ] ; then MAILPATH="$MAILPATH:`echo $HOME/mail/lists/* | sed 's/ /:/g'`" fi export MAIL MAILPATH + if [ -n "$STY" -a "$WINDOW" != 0 ]; then + unset MAILCHECK + fi BROWSER="links2:links:elinks:w3m:lynx" case "$TERM" in @@ -203,13 +206,6 @@ if [ -t 0 ] ; then unset name email - #if which pyenv >/dev/null 2>&1; then - # PYENV_ROOT="$HOME/.pyenv" - # export PYENV_ROOT - # PATH="$PYENV_ROOT/bin:$PATH" - # eval "`pyenv init --path`" - #fi - #SCREENDIR="$HOME"/tmp/screen #export SCREENDIR #mkdir -p "$SCREENDIR" -- 2.39.5