From 43643a16c0ceec879b09e53967c11e5daedbb82d Mon Sep 17 00:00:00 2001
From: takase1121 <20792268+takase1121@users.noreply.github.com>
Date: Thu, 30 Nov 2023 09:46:56 +0800
Subject: [PATCH] fix(ci,build.sh): un-hardcode lua subproject detection

---
 .github/workflows/build.yml | 11 ++++++-----
 scripts/build.sh            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1e2f01f..21f3a8b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -204,13 +204,14 @@ jobs:
         run: |
           "INSTALL_NAME=lite-xl-$($env:GITHUB_REF -replace ".*/")-windows-msvc-${{ matrix.arch.name }}" >> $env:GITHUB_ENV
           "INSTALL_REF=$($env:GITHUB_REF -replace ".*/")" >> $env:GITHUB_ENV
-          "LUA_SUBPROJECT_PATH=subprojects/lua-5.4.4" >> $env:GITHUB_ENV
+          "LUA_SUBPROJECT_PATH=subprojects/$(awk -F ' *= *' '/directory/ { printf $2 }' subprojects/lua.wrap)" >> $env:GITHUB_ENV
+      - name: Download and patch subprojects
+        shell: bash
+        run: |
+          meson subprojects download
+          cat resources/windows/001-lua-unicode.diff | patch -Np1 -d "$LUA_SUBPROJECT_PATH"
       - name: Configure
         run: |
-          # Download the subprojects first so we can patch it before configuring.
-          # This avoids reconfiguring the subprojects when compiling.
-          meson subprojects download
-          Get-Content -Path resources/windows/001-lua-unicode.diff -Raw | patch -d $env:LUA_SUBPROJECT_PATH -p1 --forward
           meson setup --wrap-mode=forcefallback build
       - name: Build
         run: |
diff --git a/scripts/build.sh b/scripts/build.sh
index 778f596d..0908ab19 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -181,7 +181,7 @@ main() {
     # download the subprojects so we can start patching before configure.
     # this will prevent reconfiguring the project.
     meson subprojects download
-    lua_subproject_path=$(echo subprojects/lua-*/)
+    lua_subproject_path="subprojects/$(awk -F ' *= *' '/directory/ { printf $2 }' subprojects/lua.wrap)"
     if [[ -d $lua_subproject_path ]]; then
       patch -d $lua_subproject_path -p1 --forward < resources/windows/001-lua-unicode.diff
     fi