瀏覽代碼

Merge pull request #165 from shangsunset/master

change minor typo in bin/pyenv-sh-activate
pull/167/head
Yamashita, Yuu 8 年之前
父節點
當前提交
23f7027ce4
共有 3 個檔案被更改,包括 6 行新增6 行删除
  1. +1
    -1
      bin/pyenv-sh-activate
  2. +4
    -4
      test/activate.bats
  3. +1
    -1
      test/conda-activate.bats

+ 1
- 1
bin/pyenv-sh-activate 查看文件

@ -218,7 +218,7 @@ PYENV_VIRTUALENV_DISABLE_PROMPT="${PYENV_VIRTUALENV_DISABLE_PROMPT:-${VIRTUAL_EN
if [ -z "${PYENV_VIRTUALENV_DISABLE_PROMPT}" ]; then if [ -z "${PYENV_VIRTUALENV_DISABLE_PROMPT}" ]; then
case "${shell}" in case "${shell}" in
fish ) fish )
echo "pyenv-virtualenv: prompt changing not work for fish." 1>&2
echo "pyenv-virtualenv: prompt changing not working for fish." 1>&2
;; ;;
* ) * )
echo "pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior." 1>&2 echo "pyenv-virtualenv: prompt changing will be removed from future release. configure \`export PYENV_VIRTUALENV_DISABLE_PROMPT=1' to simulate the behavior." 1>&2

+ 4
- 4
test/activate.bats 查看文件

@ -116,7 +116,7 @@ deactivated
pyenv-virtualenv: activate venv pyenv-virtualenv: activate venv
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
pyenv-virtualenv: prompt changing not work for fish.
pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
unstub pyenv-version-name unstub pyenv-version-name
@ -143,7 +143,7 @@ setenv PYENV_VERSION "venv";
setenv PYENV_ACTIVATE_SHELL 1; setenv PYENV_ACTIVATE_SHELL 1;
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv"; setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv";
pyenv-virtualenv: prompt changing not work for fish.
pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
unstub pyenv-version-name unstub pyenv-version-name
@ -223,7 +223,7 @@ setenv PYENV_VERSION "venv27";
setenv PYENV_ACTIVATE_SHELL 1; setenv PYENV_ACTIVATE_SHELL 1;
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
pyenv-virtualenv: prompt changing not work for fish.
pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
unstub pyenv-virtualenv-prefix unstub pyenv-virtualenv-prefix
@ -248,7 +248,7 @@ setenv PYENV_VERSION "venv27";
setenv PYENV_ACTIVATE_SHELL 1; setenv PYENV_ACTIVATE_SHELL 1;
setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; setenv PYENV_VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27"; setenv VIRTUAL_ENV "${PYENV_ROOT}/versions/venv27";
pyenv-virtualenv: prompt changing not work for fish.
pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
unstub pyenv-virtualenv-prefix unstub pyenv-virtualenv-prefix

+ 1
- 1
test/conda-activate.bats 查看文件

@ -66,7 +66,7 @@ pyenv-virtualenv: activate anaconda-2.3.0
setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0"; setenv PYENV_VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0"; setenv VIRTUAL_ENV "${TMP}/pyenv/versions/anaconda-2.3.0";
setenv CONDA_DEFAULT_ENV "root"; setenv CONDA_DEFAULT_ENV "root";
pyenv-virtualenv: prompt changing not work for fish.
pyenv-virtualenv: prompt changing not working for fish.
EOS EOS
unstub pyenv-version-name unstub pyenv-version-name

Loading…
取消
儲存