浏览代码

Fix non-bash output while detecting shell (#2561)

Co-authored-by: Ivan Pozdeev <vano@mail.mipt.ru>
pull/2575/head
Ian Chen 3 年前
提交者 GitHub
父节点
当前提交
f897c50202
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 16 次插入3 次删除
  1. +10
    -3
      libexec/pyenv-init
  2. +6
    -0
      test/init.bats

+ 10
- 3
libexec/pyenv-init 查看文件

@ -83,7 +83,7 @@ function main() {
exit 0
;;
"detect-shell")
detect_profile
detect_profile 1
print_detect_shell
exit 0
;;
@ -93,6 +93,8 @@ function main() {
}
function detect_profile() {
local detect_for_detect_shell="$1"
case "$shell" in
bash )
if [ -e '~/.bash_profile' ]; then
@ -112,8 +114,13 @@ function detect_profile() {
rc='~/.profile'
;;
* )
profile='your shell'\''s login startup file'
rc='your shell'\''s interactive startup file'
if [ -n "$detect_for_detect_shell" ]; then
profile=
rc=
else
profile='your shell'\''s login startup file'
rc='your shell'\''s interactive startup file'
fi
;;
esac
}

+ 6
- 0
test/init.bats 查看文件

@ -63,6 +63,12 @@ OUT
assert_line 'pyenv init - | source'
}
@test "shell detection for installer" {
run pyenv-init --detect-shell
assert_success
assert_line "PYENV_SHELL_DETECT=bash"
}
@test "option to skip rehash" {
run pyenv-init - --no-rehash
assert_success

正在加载...
取消
保存