Merge pull request rbenv#1203 from jf/fix_misleading_set_by_message_f…

…or_system_ruby libexec/rbenv-version: get rid of misleading "set by $(rbenv-version-origin)" message when system ruby is in use
gemmaro · Jan 16, 2020 · 7795476 · 7795476
2 parents c46a970 + 137e705
commit 7795476
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/libexec/rbenv-version b/libexec/rbenv-version
@@ -8,4 +8,11 @@
 set -e
 [ -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
diff --git a/test/version.bats b/test/version.bats
@@ -14,7 +14,7 @@ setup() {
 @test "no version selected" {
   assert [ ! -d "${RBENV_ROOT}/versions" ]
   run rbenv-version
-  assert_success "system (set by ${RBENV_ROOT}/version)"
+  assert_success "system"
 }
 
 @test "set by RBENV_VERSION" {

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