From 7773f82f747a20e776d31048156ce571ee127845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <git@mislav.net>
Date: Fri, 13 Oct 2023 18:59:11 +0200
Subject: [PATCH] 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.
---
 bin/ruby-build | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/bin/ruby-build b/bin/ruby-build
index 0afaa4b275..381e548fd5 100755
--- a/bin/ruby-build
+++ b/bin/ruby-build
@@ -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
 
-  # shellcheck disable=SC2164
-  cd "${PREFIX_PATH}/graalvm"
   if is_mac; then
-    cd Contents/Home || return $?
+    # shellcheck disable=SC2164
+    cd "${PREFIX_PATH}/graalvm/Contents/Home"
+  else
+    # shellcheck disable=SC2164
+    cd "${PREFIX_PATH}/graalvm"
   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() {