Commit f8e55e39 by Sam Stephenson

Merge remote-tracking branch 'lloeki/tarball_cache_support'

parents 87c87cfa 776c6e1d
...@@ -74,5 +74,9 @@ if [ -n "${RBENV_BUILD_ROOT}" ]; then ...@@ -74,5 +74,9 @@ if [ -n "${RBENV_BUILD_ROOT}" ]; then
KEEP="-k" KEEP="-k"
fi fi
if [ -z "${CACHE_PATH}" ] && [ -d "${RBENV_ROOT}/cache" ]; then
export CACHE_PATH="${RBENV_ROOT}/cache"
fi
ruby-build $KEEP $VERBOSE "$DEFINITION" "$PREFIX" ruby-build $KEEP $VERBOSE "$DEFINITION" "$PREFIX"
rbenv rehash rbenv rehash
...@@ -143,8 +143,11 @@ fetch_tarball() { ...@@ -143,8 +143,11 @@ fetch_tarball() {
local package_url="$2" local package_url="$2"
echo "Downloading ${package_url}..." >&2 echo "Downloading ${package_url}..." >&2
{ fetch_url "$package_url" > "${package_name}.tar.gz" { if [ ! -e "${CACHE_PATH}${package_name}.tar.gz" ]; then
tar xzvf "${package_name}.tar.gz" fetch_url "$package_url" > "${package_name}.tar.gz"
[ -n "${CACHE_PATH}" ] && mv "${package_name}.tar.gz" "${CACHE_PATH}${package_name}.tar.gz"
fi
tar xzvf "${CACHE_PATH}${package_name}.tar.gz"
} >&4 2>&1 } >&4 2>&1
} }
...@@ -462,6 +465,10 @@ else ...@@ -462,6 +465,10 @@ else
TMP="${TMPDIR%/}" TMP="${TMPDIR%/}"
fi fi
if [ -n "$CACHE_PATH" ]; then
CACHE_PATH="${CACHE_PATH%/}/"
fi
SEED="$(date "+%Y%m%d%H%M%S").$$" SEED="$(date "+%Y%m%d%H%M%S").$$"
LOG_PATH="${TMP}/ruby-build.${SEED}.log" LOG_PATH="${TMP}/ruby-build.${SEED}.log"
RUBY_BIN="${PREFIX_PATH}/bin/ruby" RUBY_BIN="${PREFIX_PATH}/bin/ruby"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment