Commit7795476

authored

Merge pull request#1203 from jf/fix_misleading_set_by_message_for_system_ruby

libexec/rbenv-version: get rid of misleading "set by $(rbenv-version-origin)" message when system ruby is in use

2 parentsc46a970 +137e705 commit7795476Copy full SHA for 7795476

File tree

+12

-5

lines changed

+12

-5

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,11 @@`
`8`	`8`	`set -e`
`9`	`9`	`[-n"$RBENV_DEBUG" ]&&set -x`
`10`	`10`
`11`		`-echo"$(rbenv-version-name) (set by$(rbenv-version-origin))"`
	`11`	`+version_name="$(rbenv-version-name)"`
	`12`	`+version_origin="$(rbenv-version-origin)"`
	`13`	`+`
	`14`	`+if ["$version_origin"="${RBENV_ROOT}/version" ]&& [!-e"$version_origin" ];then`
	`15`	`+echo"$version_name"`
	`16`	`+else`
	`17`	`+echo"$version_name (set by$version_origin)"`
	`18`	`+fi`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ setup() {`
`14`	`14`	`@test"no version selected" {`
`15`	`15`	`assert [!-d"${RBENV_ROOT}/versions" ]`
`16`	`16`	`run rbenv-version`
`17`		`- assert_success"system (set by${RBENV_ROOT}/version)"`
	`17`	`+ assert_success"system"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@test"set by RBENV_VERSION" {`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ stub_system_ruby() {`
`21`	`21`	`stub_system_ruby`
`22`	`22`	`assert [!-d"${RBENV_ROOT}/versions" ]`
`23`	`23`	`run rbenv-versions`
`24`		`- assert_success"* system (set by${RBENV_ROOT}/version)"`
	`24`	`+ assert_success"* system"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@test"not even system ruby available" {`
`@@ -42,7 +42,7 @@ stub_system_ruby() {`
`42`	`42`	`run rbenv-versions`
`43`	`43`	`assert_success`
`44`	`44`	`assert_output<<OUT`
`45`		`-* system (set by${RBENV_ROOT}/version)`
	`45`	`+* system`
`46`	`46`	`1.9`
`47`	`47`	`OUT`
`48`	`48`	`}`
`@@ -61,7 +61,7 @@ OUT`
`61`	`61`	`run rbenv-versions`
`62`	`62`	`assert_success`
`63`	`63`	`assert_output<<OUT`
`64`		`-* system (set by${RBENV_ROOT}/version)`
	`64`	`+* system`
`65`	`65`	`1.8.7`
`66`	`66`	`1.9.3`
`67`	`67`	`2.0.0`

Comments

(0)