m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-14 22:43:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fish: use "set -gx" instead of "setenv" (#218)

Browse Source 
Use `set -gx` instead of `setenv` for fish shell.

Fix test "activate if the first virtualenv is a virtualenv": it was asserting
the output was of bash form, but not specifying that in the test — it now does.

Fixes https://github.com/pyenv/pyenv-virtualenv/issues/216.
This commit is contained in:
Drummond Ogilvie
2017-06-08 20:52:57 +01:00
committed by Daniel Hahler
parent 252d6763f9
commit 862be21a32
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/pyenv-sh-activate
View File

@@ -146,8 +146,8 @@ if [ -z "$no_shell" ]; then
case "$shell" in
fish )
cat <<EOS
setenv PYENV_VERSION "${versions[*]}";
setenv PYENV_ACTIVATE_SHELL 1;
set -gx PYENV_VERSION "${versions[*]}";
set -gx PYENV_ACTIVATE_SHELL 1;
EOS
;;
* )
@@ -164,8 +164,8 @@ fi
case "${shell}" in
fish )
cat <<EOS
setenv PYENV_VIRTUAL_ENV "${prefix}";
setenv VIRTUAL_ENV "${prefix}";
set -gx PYENV_VIRTUAL_ENV "${prefix}";
set -gx VIRTUAL_ENV "${prefix}";
EOS
;;
* )
@@ -185,7 +185,7 @@ if [ -x "${prefix}/bin/conda" ]; then
fi
case "${shell}" in
fish )
echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
;;
* )
echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
@@ -197,7 +197,7 @@ if [ -n "${PYTHONHOME}" ]; then
case "${shell}" in
fish )
cat <<EOS
setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
set -e PYTHONHOME;
EOS
;;

4
bin/pyenv-sh-deactivate
View File

@@ -125,7 +125,7 @@ case "${shell}" in
fish )
cat <<EOS
if [ -n "\$_OLD_VIRTUAL_PATH" ];
setenv PATH "\$_OLD_VIRTUAL_PATH";
set -gx PATH "\$_OLD_VIRTUAL_PATH";
set -e _OLD_VIRTUAL_PATH;
end;
EOS
@@ -144,7 +144,7 @@ case "${shell}" in
fish )
cat <<EOS
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
set -e _OLD_VIRTUAL_PYTHONHOME;
end;
EOS

4
bin/pyenv-virtualenv-init
View File

@@ -86,8 +86,8 @@ fi
case "$shell" in
fish )
cat <<EOS
setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
setenv PYENV_VIRTUALENV_INIT 1;
set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
set -gx PYENV_VIRTUALENV_INIT 1;
EOS
;;
* )