github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-14 20:39:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1203 from jf/fix_misleading_set_by_message_for_system_ruby

Browse source 
libexec/rbenv-version: get rid of misleading "set by $(rbenv-version-origin)" message when system ruby is in use
This commit is contained in:
Mislav Marohnić 2020-01-16 19:47:52 +01:00 committed by GitHub
commit 7795476af1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libexec/rbenv-version
View file

@ -8,4 +8,11 @@
set -e set -e
[ -n "$RBENV_DEBUG" ] && set -x [ -n "$RBENV_DEBUG" ] && set -x
echo "$(rbenv-version-name) (set by $(rbenv-version-origin))" version_name="$(rbenv-version-name)"
version_origin="$(rbenv-version-origin)"
if [ "$version_origin" = "${RBENV_ROOT}/version" ] && [ ! -e "$version_origin" ]; then
echo "$version_name"
else
echo "$version_name (set by $version_origin)"
fi

2
test/version.bats
View file

@ -14,7 +14,7 @@ setup() {
@test "no version selected" { @test "no version selected" {
assert [ ! -d "${RBENV_ROOT}/versions" ] assert [ ! -d "${RBENV_ROOT}/versions" ]
run rbenv-version run rbenv-version
assert_success "system (set by ${RBENV_ROOT}/version)" assert_success "system"
} }
@test "set by RBENV_VERSION" { @test "set by RBENV_VERSION" {

6
test/versions.bats
View file

@ -21,7 +21,7 @@ stub_system_ruby() {
stub_system_ruby stub_system_ruby
assert [ ! -d "${RBENV_ROOT}/versions" ] assert [ ! -d "${RBENV_ROOT}/versions" ]
run rbenv-versions run rbenv-versions
assert_success "* system (set by ${RBENV_ROOT}/version)" assert_success "* system"
} }
@test "not even system ruby available" { @test "not even system ruby available" {
@ -42,7 +42,7 @@ stub_system_ruby() {
run rbenv-versions run rbenv-versions
assert_success assert_success
assert_output <<OUT assert_output <<OUT
* system (set by ${RBENV_ROOT}/version) * system
1.9 1.9
OUT OUT
} }
@ -61,7 +61,7 @@ OUT
run rbenv-versions run rbenv-versions
assert_success assert_success
assert_output <<OUT assert_output <<OUT
* system (set by ${RBENV_ROOT}/version) * system
1.8.7 1.8.7
1.9.3 1.9.3
2.0.0 2.0.0