From d4faae187a7eb8fd6f4b9d2aacdb3352bf7d3fec Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Sun, 30 Dec 2012 21:14:04 -0600 Subject: [PATCH] Read both .ruby-version and .rbenv-version, but write (and migrate to) .ruby-version --- libexec/rbenv-local | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libexec/rbenv-local b/libexec/rbenv-local index a0b3fe7..3607bad 100755 --- a/libexec/rbenv-local +++ b/libexec/rbenv-local @@ -6,14 +6,18 @@ # rbenv local --unset # # Sets the local directory-specific Ruby version by writing the version -# name to a file named `.rbenv-version'. +# name to a file named `.ruby-version'. # -# When you run a Ruby command, rbenv will look for an `.rbenv-version' +# When you run a Ruby command, rbenv will look for a `.ruby-version' # file in the current directory and each parent directory. If no such # file is found in the tree, rbenv will use the global Ruby version # specified with `rbenv global', or the version specified in the # RBENV_VERSION environment variable. # +# For backwards compatibility, rbenv will also read version +# specifications from `.rbenv-version' files, but a `.ruby-version' +# file in the same directory takes precedence. +# # should be a string matching a Ruby version known to rbenv. # The special version string `system' will use your default system Ruby. # Run `rbenv versions' for a list of available Ruby versions. @@ -29,14 +33,18 @@ if [ "$1" = "--complete" ]; then fi RBENV_VERSION="$1" -RBENV_VERSION_FILE=".rbenv-version" if [ "$RBENV_VERSION" = "--unset" ]; then - rm -f "$RBENV_VERSION_FILE" + rm -f .ruby-version .rbenv-version elif [ -n "$RBENV_VERSION" ]; then - rbenv-version-file-write "$RBENV_VERSION_FILE" "$RBENV_VERSION" + if [ "$(RBENV_VERSION= rbenv-version-origin)" -ef .rbenv-version ]; then + echo "rbenv: migrated .rbenv-version file to .ruby-version" >&2 + rm -f .rbenv-version + fi + rbenv-version-file-write .ruby-version "$RBENV_VERSION" else - rbenv-version-file-read "$RBENV_VERSION_FILE" || + rbenv-version-file-read .ruby-version || + rbenv-version-file-read .rbenv-version || { echo "rbenv: no local version configured for this directory" exit 1 } >&2