Skip to content

R
ruby-build
Commit 638f28b5 by Mislav Marohnić
Options

Merge branch 'rbx-build'

parents 8e16aab8 8b6616b8
Showing with 8 additions and 6 deletions
bin/ruby-build
...@@ -444,7 +444,7 @@ build_package_ree_installer() { ...@@ -444,7 +444,7 @@ build_package_ree_installer() {
build_package_rbx() { build_package_rbx() {
local package_name="$1" local package_name="$1"
{ bundle { bundle --path=vendor/bundle
./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS
rake install rake install
fix_rbx_gem_binstubs "$PREFIX_PATH" fix_rbx_gem_binstubs "$PREFIX_PATH"
...@@ -743,11 +743,13 @@ bundle() { ...@@ -743,11 +743,13 @@ bundle() {
} }
isolated_gem_dependency() { isolated_gem_dependency() {
local output="$(command $1 2>/dev/null || true)" set +E
if [ -z "$output" ]; then ( command $1 &>/dev/null ) || {
set -E
shift 1 shift 1
isolated_gem_install "$@" isolated_gem_install "$@"
fi }
set -E
} }
isolated_gem_install() { isolated_gem_install() {
......
test/build.bats
...@@ -217,7 +217,7 @@ DEF ...@@ -217,7 +217,7 @@ DEF
stub rake false stub rake false
stub bundle \ stub bundle \
'--version : echo 1' \ '--version : echo 1' \
' : echo bundle >> build.log' \ ' : echo bundle "$@" >> build.log' \
'--version : echo 1' \ '--version : echo 1' \
" exec rake install : { cat build.log; echo bundle \"\$@\"; } >> '$INSTALL_ROOT/build.log'" " exec rake install : { cat build.log; echo bundle \"\$@\"; } >> '$INSTALL_ROOT/build.log'"
...@@ -229,7 +229,7 @@ DEF ...@@ -229,7 +229,7 @@ DEF
unstub bundle unstub bundle
assert_build_log <<OUT assert_build_log <<OUT
bundle bundle --path=vendor/bundle
rubinius-2.0.0: --prefix=$INSTALL_ROOT rubinius-2.0.0: --prefix=$INSTALL_ROOT
bundle exec rake install bundle exec rake install
OUT OUT
......
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