Explorar el Código

Automatically create a default of system if it's missing instead of raising an error

pull/360/head^2
Sam Stephenson hace 15 años
padre
commit
9f18fe5031
Se han modificado 3 ficheros con 7 adiciones y 7 borrados
  1. +0
    -1
      libexec/rbenv-init
  2. +6
    -5
      libexec/rbenv-version
  3. +1
    -1
      libexec/rbenv-versions

+ 0
- 1
libexec/rbenv-init Ver fichero

@ -51,7 +51,6 @@ if [ -z "$print" ]; then
fi fi
mkdir -p "${HOME}/.rbenv/{shims,versions}" mkdir -p "${HOME}/.rbenv/{shims,versions}"
[ -e "${HOME}/.rbenv/default" ] || echo system > "${HOME}/.rbenv/default"
echo 'export PATH="${HOME}/.rbenv/shims:${PATH}"' echo 'export PATH="${HOME}/.rbenv/shims:${PATH}"'

+ 6
- 5
libexec/rbenv-version Ver fichero

@ -16,10 +16,11 @@ find_version_file() {
return 1 return 1
} }
DEFAULT_PATH="${HOME}/.rbenv/default"
find_default_version_file() { find_default_version_file() {
local default_path="$HOME/.rbenv/default"
if [ -e "$default_path" ]; then
echo "$default_path"
if [ -e "$DEFAULT_PATH" ]; then
echo "$DEFAULT_PATH"
return 0 return 0
fi fi
return 1 return 1
@ -31,8 +32,8 @@ if [ -z "$RBENV_VERSION" ]; then
if [ -n "$RBENV_VERSION_FILE" ]; then if [ -n "$RBENV_VERSION_FILE" ]; then
RBENV_VERSION="$(read_version_file "$RBENV_VERSION_FILE")" RBENV_VERSION="$(read_version_file "$RBENV_VERSION_FILE")"
else else
echo "rbenv: no default version specified" >&2
exit 1
echo system > "$DEFAULT_PATH"
RBENV_VERSION=system
fi fi
fi fi

+ 1
- 1
libexec/rbenv-versions Ver fichero

@ -1,6 +1,6 @@
#!/usr/bin/env bash -e #!/usr/bin/env bash -e
RBENV_VERSION="$(rbenv-version 2>/dev/null || true)"
RBENV_VERSION="$(rbenv-version)"
hit_prefix="* " hit_prefix="* "
miss_prefix=" " miss_prefix=" "

Cargando…
Cancelar
Guardar