Commit 4f72a159 authored by Sam Stephenson's avatar Sam Stephenson
Browse files

CACHE_PATH -> RUBY_BUILD_CACHE_PATH

parent f8e55e39

bin/rbenv-install

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ if [ -n "${RBENV_BUILD_ROOT}" ]; then 
  KEEP="-k"

fi



if [ -z "${CACHE_PATH}" ] && [ -d "${RBENV_ROOT}/cache" ]; then

  export CACHE_PATH="${RBENV_ROOT}/cache"

if [ -z "${RUBY_BUILD_CACHE_PATH}" ] && [ -d "${RBENV_ROOT}/cache" ]; then

  export RUBY_BUILD_CACHE_PATH="${RBENV_ROOT}/cache"

fi



ruby-build $KEEP $VERBOSE "$DEFINITION" "$PREFIX"

bin/ruby-build

+5 −5
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ fetch_tarball() { 
  local package_url="$2"



  echo "Downloading ${package_url}..." >&2

  { if [ ! -e "${CACHE_PATH}${package_name}.tar.gz" ]; then

  { if [ ! -e "${RUBY_BUILD_CACHE_PATH}${package_name}.tar.gz" ]; then

      fetch_url "$package_url" > "${package_name}.tar.gz"

      [ -n "${CACHE_PATH}" ] && mv "${package_name}.tar.gz" "${CACHE_PATH}${package_name}.tar.gz"

      [ -n "${RUBY_BUILD_CACHE_PATH}" ] && mv "${package_name}.tar.gz" "${RUBY_BUILD_CACHE_PATH}${package_name}.tar.gz"

    fi

    tar xzvf "${CACHE_PATH}${package_name}.tar.gz"

    tar xzvf "${RUBY_BUILD_CACHE_PATH}${package_name}.tar.gz"

  } >&4 2>&1

}
@@ -465,8 +465,8 @@ else 
  TMP="${TMPDIR%/}"

fi



if [ -n "$CACHE_PATH" ]; then

  CACHE_PATH="${CACHE_PATH%/}/"

if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then

  RUBY_BUILD_CACHE_PATH="${RUBY_BUILD_CACHE_PATH%/}/"

fi



SEED="$(date "+%Y%m%d%H%M%S").$$"