diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init index 03feec7d..62956b12 100755 --- a/bin/pyenv-virtualenv-init +++ b/bin/pyenv-virtualenv-init @@ -132,9 +132,11 @@ EOS if test -n "\$PYENV_VERSION" return \$ret end - if test "\$PWD" = "\$_PYENV_VH_PWD" \\ - -a "(stat ${_stat_fmt} \$_PYENV_VH_PATHS 2>/dev/null)" = "\$_PYENV_VH_MTIMES" - return \$ret + if test "\$PWD" = "\$_PYENV_VH_PWD" + set -l mtimes (stat ${_stat_fmt} \$_PYENV_VH_PATHS 2>/dev/null) + if test (string join " " \$mtimes) = (string join " " \$_PYENV_VH_MTIMES) + return \$ret + end end end EOS diff --git a/test/init.bats b/test/init.bats index 11e3a1ba..79cba6ba 100644 --- a/test/init.bats +++ b/test/init.bats @@ -112,9 +112,11 @@ function _pyenv_virtualenv_hook --on-event fish_prompt; if test -n "\$PYENV_VERSION" return \$ret end - if test "\$PWD" = "\$_PYENV_VH_PWD" \\ - -a "(stat ${_stat_fmt} \$_PYENV_VH_PATHS 2>/dev/null)" = "\$_PYENV_VH_MTIMES" - return \$ret + if test "\$PWD" = "\$_PYENV_VH_PWD" + set -l mtimes (stat ${_stat_fmt} \$_PYENV_VH_PATHS 2>/dev/null) + if test (string join " " \$mtimes) = (string join " " \$_PYENV_VH_MTIMES) + return \$ret + end end end if [ -n "\$VIRTUAL_ENV" ]