Skip to content

Commit 862be21

Browse files
daogilvieblueyed
daogilvie
authored and
blueyed
committed
fish: use "set -gx" instead of "setenv" (#218)
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 #216.
1 parent 252d676 commit 862be21

File tree

8 files changed

+42
-42
lines changed

8 files changed

+42
-42
lines changed

‎bin/pyenv-sh-activate‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ if [ -z "$no_shell" ]; then
146146
case "$shell" in
147147
fish )
148148
cat <<EOS
149-
setenv PYENV_VERSION "${versions[*]}";
150-
setenv PYENV_ACTIVATE_SHELL 1;
149+
set -gx PYENV_VERSION "${versions[*]}";
150+
set -gx PYENV_ACTIVATE_SHELL 1;
151151
EOS
152152
;;
153153
* )
@@ -164,8 +164,8 @@ fi
164164
case "${shell}" in
165165
fish )
166166
cat <<EOS
167-
setenv PYENV_VIRTUAL_ENV "${prefix}";
168-
setenv VIRTUAL_ENV "${prefix}";
167+
set -gx PYENV_VIRTUAL_ENV "${prefix}";
168+
set -gx VIRTUAL_ENV "${prefix}";
169169
EOS
170170
;;
171171
* )
@@ -185,7 +185,7 @@ if [ -x "${prefix}/bin/conda" ]; then
185185
fi
186186
case "${shell}" in
187187
fish )
188-
echo "setenv CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
188+
echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
189189
;;
190190
* )
191191
echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
@@ -197,7 +197,7 @@ if [ -n "${PYTHONHOME}" ]; then
197197
case "${shell}" in
198198
fish )
199199
cat <<EOS
200-
setenv _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
200+
set -gx _OLD_VIRTUAL_PYTHONHOME "${PYTHONHOME}";
201201
set -e PYTHONHOME;
202202
EOS
203203
;;

‎bin/pyenv-sh-deactivate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ case "${shell}" in
125125
fish )
126126
cat <<EOS
127127
if [ -n "\$_OLD_VIRTUAL_PATH" ];
128-
setenv PATH "\$_OLD_VIRTUAL_PATH";
128+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
129129
set -e _OLD_VIRTUAL_PATH;
130130
end;
131131
EOS
@@ -144,7 +144,7 @@ case "${shell}" in
144144
fish )
145145
cat <<EOS
146146
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
147-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
147+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
148148
set -e _OLD_VIRTUAL_PYTHONHOME;
149149
end;
150150
EOS

‎bin/pyenv-virtualenv-init‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ fi
8686
case "$shell" in
8787
fish )
8888
cat <<EOS
89-
setenv PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
90-
setenv PYENV_VIRTUALENV_INIT 1;
89+
set -gx PATH '${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims' \$PATH;
90+
set -gx PYENV_VIRTUALENV_INIT 1;
9191
EOS
9292
;;
9393
* )

‎test/activate.bats‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ EOS
138138
assert_success
139139
assert_output <<EOS
140140
deactivated
141-
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
142-
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
141+
set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
142+
set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
143143
pyenv-virtualenv: prompt changing not working for fish.
144144
EOS
145145

@@ -162,10 +162,10 @@ EOS
162162
assert_success
163163
assert_output <<EOS
164164
deactivated
165-
setenv PYENV_VERSION "venv";
166-
setenv PYENV_ACTIVATE_SHELL 1;
167-
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
168-
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
165+
set -gx PYENV_VERSION "venv";
166+
set -gx PYENV_ACTIVATE_SHELL 1;
167+
set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
168+
set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
169169
pyenv-virtualenv: prompt changing not working for fish.
170170
EOS
171171

@@ -239,10 +239,10 @@ EOS
239239
assert_success
240240
assert_output <<EOS
241241
deactivated
242-
setenv PYENV_VERSION "venv27";
243-
setenv PYENV_ACTIVATE_SHELL 1;
244-
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
245-
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
242+
set -gx PYENV_VERSION "venv27";
243+
set -gx PYENV_ACTIVATE_SHELL 1;
244+
set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
245+
set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
246246
pyenv-virtualenv: prompt changing not working for fish.
247247
EOS
248248

@@ -263,10 +263,10 @@ EOS
263263
assert_success
264264
assert_output <<EOS
265265
deactivated
266-
setenv PYENV_VERSION "venv27";
267-
setenv PYENV_ACTIVATE_SHELL 1;
268-
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
269-
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
266+
set -gx PYENV_VERSION "venv27";
267+
set -gx PYENV_ACTIVATE_SHELL 1;
268+
set -gx PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
269+
set -gx VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
270270
pyenv-virtualenv: prompt changing not working for fish.
271271
EOS
272272

@@ -381,7 +381,7 @@ EOS
381381
stub pyenv-virtualenv-prefix "2.7.10 : false"
382382
stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
383383

384-
run pyenv-sh-activate "venv27" "2.7.10"
384+
PYENV_SHELL="bash" run pyenv-sh-activate "venv27" "2.7.10"
385385

386386
assert_success
387387
assert_output <<EOS

‎test/conda-activate.bats‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ EOS
6262
assert_success
6363
assert_output <<EOS
6464
deactivated
65-
setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
66-
setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
67-
setenv CONDA_DEFAULT_ENV "root";
65+
set -gx PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
66+
set -gx VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
67+
set -gx CONDA_DEFAULT_ENV "root";
6868
pyenv-virtualenv: prompt changing not working for fish.
6969
EOS
7070

‎test/conda-deactivate.bats‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ set -e PYENV_VIRTUAL_ENV;
6969
set -e VIRTUAL_ENV;
7070
set -e CONDA_DEFAULT_ENV;
7171
if [ -n "\$_OLD_VIRTUAL_PATH" ];
72-
setenv PATH "\$_OLD_VIRTUAL_PATH";
72+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
7373
set -e _OLD_VIRTUAL_PATH;
7474
end;
7575
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
76-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
76+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
7777
set -e _OLD_VIRTUAL_PYTHONHOME;
7878
end;
7979
if functions -q deactivate;

‎test/deactivate.bats‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,11 @@ EOS
247247
set -e PYENV_VIRTUAL_ENV;
248248
set -e VIRTUAL_ENV;
249249
if [ -n "\$_OLD_VIRTUAL_PATH" ];
250-
setenv PATH "\$_OLD_VIRTUAL_PATH";
250+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
251251
set -e _OLD_VIRTUAL_PATH;
252252
end;
253253
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
254-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
254+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
255255
set -e _OLD_VIRTUAL_PYTHONHOME;
256256
end;
257257
if functions -q deactivate;
@@ -273,11 +273,11 @@ EOS
273273
set -e PYENV_VIRTUAL_ENV;
274274
set -e VIRTUAL_ENV;
275275
if [ -n "\$_OLD_VIRTUAL_PATH" ];
276-
setenv PATH "\$_OLD_VIRTUAL_PATH";
276+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
277277
set -e _OLD_VIRTUAL_PATH;
278278
end;
279279
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
280-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
280+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
281281
set -e _OLD_VIRTUAL_PYTHONHOME;
282282
end;
283283
if functions -q deactivate;
@@ -301,11 +301,11 @@ set -e PYENV_ACTIVATE_SHELL;
301301
set -e PYENV_VIRTUAL_ENV;
302302
set -e VIRTUAL_ENV;
303303
if [ -n "\$_OLD_VIRTUAL_PATH" ];
304-
setenv PATH "\$_OLD_VIRTUAL_PATH";
304+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
305305
set -e _OLD_VIRTUAL_PATH;
306306
end;
307307
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
308-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
308+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
309309
set -e _OLD_VIRTUAL_PYTHONHOME;
310310
end;
311311
if functions -q deactivate;
@@ -329,11 +329,11 @@ set -e PYENV_ACTIVATE_SHELL;
329329
set -e PYENV_VIRTUAL_ENV;
330330
set -e VIRTUAL_ENV;
331331
if [ -n "\$_OLD_VIRTUAL_PATH" ];
332-
setenv PATH "\$_OLD_VIRTUAL_PATH";
332+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
333333
set -e _OLD_VIRTUAL_PATH;
334334
end;
335335
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
336-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
336+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
337337
set -e _OLD_VIRTUAL_PYTHONHOME;
338338
end;
339339
if functions -q deactivate;
@@ -355,11 +355,11 @@ EOS
355355
set -e PYENV_VIRTUAL_ENV;
356356
set -e VIRTUAL_ENV;
357357
if [ -n "\$_OLD_VIRTUAL_PATH" ];
358-
setenv PATH "\$_OLD_VIRTUAL_PATH";
358+
set -gx PATH "\$_OLD_VIRTUAL_PATH";
359359
set -e _OLD_VIRTUAL_PATH;
360360
end;
361361
if [ -n "\$_OLD_VIRTUAL_PYTHONHOME" ];
362-
setenv PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
362+
set -gx PYTHONHOME "\$_OLD_VIRTUAL_PYTHONHOME";
363363
set -e _OLD_VIRTUAL_PYTHONHOME;
364364
end;
365365
if functions -q deactivate;

‎test/init.bats‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ EOS
7272
run pyenv-virtualenv-init - fish
7373
assert_success
7474
assert_output <<EOS
75-
setenv PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
76-
setenv PYENV_VIRTUALENV_INIT 1;
75+
set -gx PATH '${TMP}/pyenv/plugins/pyenv-virtualenv/shims' \$PATH;
76+
set -gx PYENV_VIRTUALENV_INIT 1;
7777
function _pyenv_virtualenv_hook --on-event fish_prompt;
7878
set -l ret \$status
7979
if [ -n "\$VIRTUAL_ENV" ]

0 commit comments

Comments
 (0)