From 896de60e44f778b2a2bb43083aac79c7da3534e0 Mon Sep 17 00:00:00 2001 From: Marin Minnerly Date: Sat, 6 Apr 2024 20:35:12 -0700 Subject: [PATCH 1/2] Fix building on MacOS --- scripts/build-roblox-model.sh | 4 ++-- scripts/build-wally-package.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-roblox-model.sh b/scripts/build-roblox-model.sh index 4909ad86..cb2e1e52 100755 --- a/scripts/build-roblox-model.sh +++ b/scripts/build-roblox-model.sh @@ -11,8 +11,8 @@ build_with_darklua_config () { mkdir -p roblox - cp -rL node_modules/ roblox/ - cp -r roblox-model/ roblox/ + cp -rL node_modules roblox + cp -r roblox-model roblox for module_path in roblox/roblox-model/*; do module_name=$(basename $module_path) diff --git a/scripts/build-wally-package.sh b/scripts/build-wally-package.sh index 79d07e5f..891d8558 100755 --- a/scripts/build-wally-package.sh +++ b/scripts/build-wally-package.sh @@ -6,7 +6,7 @@ rm -rf roblox/node_modules mkdir -p roblox -cp -rL node_modules/ roblox/ +cp -rL node_modules roblox ./scripts/remove-tests.sh roblox/node_modules From f2f1608e9ec378e70b12c98499eb22c96e317721 Mon Sep 17 00:00:00 2001 From: Marin Minnerly Date: Sat, 6 Apr 2024 20:40:32 -0700 Subject: [PATCH 2/2] Simplify diff -- only need to omit a trailing slash on first dir --- scripts/build-roblox-model.sh | 4 ++-- scripts/build-wally-package.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-roblox-model.sh b/scripts/build-roblox-model.sh index cb2e1e52..ff641744 100755 --- a/scripts/build-roblox-model.sh +++ b/scripts/build-roblox-model.sh @@ -11,8 +11,8 @@ build_with_darklua_config () { mkdir -p roblox - cp -rL node_modules roblox - cp -r roblox-model roblox + cp -rL node_modules roblox/ + cp -r roblox-model roblox/ for module_path in roblox/roblox-model/*; do module_name=$(basename $module_path) diff --git a/scripts/build-wally-package.sh b/scripts/build-wally-package.sh index 891d8558..86cb7ff8 100755 --- a/scripts/build-wally-package.sh +++ b/scripts/build-wally-package.sh @@ -6,7 +6,7 @@ rm -rf roblox/node_modules mkdir -p roblox -cp -rL node_modules roblox +cp -rL node_modules roblox/ ./scripts/remove-tests.sh roblox/node_modules