Commit 7773f82f authored by Mislav Marohnić's avatar Mislav Marohnić Committed by Benoit Daloze
Browse files

Cleanup in truffleruby+graalvm installation 

Reuse original `build_package_copy` instead of having to maintain an additional `build_package_copy_to` step.

As a bonus, this prevents a global variable `to` from leaking.
parent 536495d1

bin/ruby-build

+8 −11
Original line number Diff line number Diff line
@@ -821,12 +821,14 @@ build_package_truffleruby() { 


build_package_truffleruby_graalvm() {

  clean_prefix_path_truffleruby || return $?

  build_package_copy_to "${PREFIX_PATH}/graalvm"

  PREFIX_PATH="${PREFIX_PATH}/graalvm" build_package_copy



  if is_mac; then

    # shellcheck disable=SC2164

    cd "${PREFIX_PATH}/graalvm/Contents/Home"

  else

    # shellcheck disable=SC2164

    cd "${PREFIX_PATH}/graalvm"

  if is_mac; then

    cd Contents/Home || return $?

  fi



  if [ -e bin/gu ]; then
@@ -879,14 +881,9 @@ clean_prefix_path_truffleruby() { 
  rm -rf "$PREFIX_PATH"

}



build_package_copy_to() {

  to="$1"

  mkdir -p "$to"

  cp -fR . "$to"

}



build_package_copy() {

  build_package_copy_to "$PREFIX_PATH"

  mkdir -p "$PREFIX_PATH"

  cp -fR . "$PREFIX_PATH"

}



before_install_package() {