Просмотр исходного кода

"per-project" -> "application-specific"

pull/360/head^2
Sam Stephenson 13 лет назад
Родитель
Сommit
149f4b4607
3 измененных файлов: 14 добавлений и 13 удалений
  1. +6
    -6
      README.md
  2. +6
    -5
      libexec/rbenv-local
  3. +2
    -2
      libexec/rbenv-sh-shell

+ 6
- 6
README.md Просмотреть файл

@ -230,8 +230,8 @@ first argument. The most common subcommands are:
Sets the global version of Ruby to be used in all shells by writing Sets the global version of Ruby to be used in all shells by writing
the version name to the `~/.rbenv/version` file. This version can be the version name to the `~/.rbenv/version` file. This version can be
overridden by a per-project `.ruby-version` file, or by setting the
`RBENV_VERSION` environment variable.
overridden by an application-specific `.ruby-version` file, or by
setting the `RBENV_VERSION` environment variable.
$ rbenv global 1.9.3-p327 $ rbenv global 1.9.3-p327
@ -243,8 +243,8 @@ currently configured global version.
### rbenv local ### ### rbenv local ###
Sets a local per-project Ruby version by writing the version name to
a `.ruby-version` file in the current directory. This version
Sets a local application-specific Ruby version by writing the version
name to a `.ruby-version` file in the current directory. This version
overrides the global, and can be overridden itself by setting the overrides the global, and can be overridden itself by setting the
`RBENV_VERSION` environment variable or with the `rbenv shell` `RBENV_VERSION` environment variable or with the `rbenv shell`
command. command.
@ -264,8 +264,8 @@ read a local version specified in an `.rbenv-version` file, but a
### rbenv shell ### ### rbenv shell ###
Sets a shell-specific Ruby version by setting the `RBENV_VERSION` Sets a shell-specific Ruby version by setting the `RBENV_VERSION`
environment variable in your shell. This version overrides both
project-specific versions and the global version.
environment variable in your shell. This version overrides
application-specific versions and the global version.
$ rbenv shell jruby-1.7.1 $ rbenv shell jruby-1.7.1

+ 6
- 5
libexec/rbenv-local Просмотреть файл

@ -1,18 +1,19 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Summary: Set or show the local directory-specific Ruby version
# Summary: Set or show the local application-specific Ruby version
# #
# Usage: rbenv local <version> # Usage: rbenv local <version>
# rbenv local --unset # rbenv local --unset
# #
# Sets the local directory-specific Ruby version by writing the version
# name to a file named `.ruby-version'.
# Sets the local application-specific Ruby version by writing the
# version name to a file named `.ruby-version'.
# #
# When you run a Ruby command, rbenv will look for a `.ruby-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 in the current directory and each parent directory. If no such
# file is found in the tree, rbenv will use the global Ruby version # 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.
# specified with `rbenv global'. A version specified with the
# `RBENV_VERSION' environment variable takes precedence over local
# and global versions.
# #
# For backwards compatibility, rbenv will also read version # For backwards compatibility, rbenv will also read version
# specifications from `.rbenv-version' files, but a `.ruby-version' # specifications from `.rbenv-version' files, but a `.ruby-version'

+ 2
- 2
libexec/rbenv-sh-shell Просмотреть файл

@ -6,8 +6,8 @@
# rbenv shell --unset # rbenv shell --unset
# #
# Sets a shell-specific Ruby version by setting the `RBENV_VERSION' # Sets a shell-specific Ruby version by setting the `RBENV_VERSION'
# environment variable in your shell. This version overrides both
# project-specific versions and the global version.
# environment variable in your shell. This version overrides local
# application-specific versions and the global version.
# #
# <version> should be a string matching a Ruby version known to rbenv. # <version> should be a string matching a Ruby version known to rbenv.
# The special version string `system' will use your default system Ruby. # The special version string `system' will use your default system Ruby.

Загрузка…
Отмена
Сохранить