Skip to content

Commit

Permalink
ruby-build now supports $RUBY_BUILD_BUILD_PATH to specify the locatio…
Browse files Browse the repository at this point in the history
…n of the BUILD_PATH instead of a seeded directory under TMP
  • Loading branch information
raggi committed Apr 28, 2012
1 parent e69f559 commit f6c2bfe
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions bin/ruby-build
Expand Up @@ -28,8 +28,8 @@ build_failed() {
echo "BUILD FAILED"
echo

if ! rmdir "${TEMP_PATH}" 2>/dev/null; then
echo "Inspect or clean up the working tree at ${TEMP_PATH}"
if ! rmdir "${BUILD_PATH}" 2>/dev/null; then
echo "Inspect or clean up the working tree at ${BUILD_PATH}"

if file_is_not_empty "$LOG_PATH"; then
echo "Results logged to ${LOG_PATH}"
Expand Down Expand Up @@ -68,7 +68,7 @@ install_package_using() {
local package_name="$3"
shift 3

pushd "$TEMP_PATH" >&4
pushd "$BUILD_PATH" >&4
"fetch_${package_type}" "$package_name" $*
shift $(($package_type_nargs))
make_package "$package_name" $*
Expand Down Expand Up @@ -404,10 +404,15 @@ fi

SEED="$(date "+%Y%m%d%H%M%S").$$"
LOG_PATH="${TMP}/ruby-build.${SEED}.log"
TEMP_PATH="${TMP}/ruby-build.${SEED}"
RUBY_BIN="${PREFIX_PATH}/bin/ruby"
CWD="$(pwd)"

if [ -z $RUBY_BUILD_BUILD_PATH ]; then
BUILD_PATH="${TMP}/ruby-build.${SEED}"
else
BUILD_PATH=$RUBY_BUILD_BUILD_PATH
fi

exec 4<> "$LOG_PATH" # open the log file at fd 4
if [ -n "$VERBOSE" ]; then
tail -f "$LOG_PATH" &
Expand All @@ -421,7 +426,7 @@ unset RUBYOPT
unset RUBYLIB

trap build_failed ERR
mkdir -p "$TEMP_PATH"
mkdir -p "$BUILD_PATH"
source "$DEFINITION_PATH"
rm -fr "$TEMP_PATH"
rm -fr "$BUILD_PATH"
trap - ERR

0 comments on commit f6c2bfe

Please sign in to comment.