From d655541f448888fdee217b66d2f9916dbf2de15b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 29 Nov 2024 21:11:43 -0800
Subject: [PATCH 1/3] copy updated symbols.xml into DF game dir before rerun

---
 .github/workflows/generate-symbols.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generate-symbols.yml b/.github/workflows/generate-symbols.yml
index dc415f6011..00afc26755 100644
--- a/.github/workflows/generate-symbols.yml
+++ b/.github/workflows/generate-symbols.yml
@@ -134,6 +134,11 @@ jobs:
         tar xjf dfhack-symbols-linux64-build.tar.bz2 -C DF_steam
         xml/symbols_gen_linux.sh ${{ inputs.version == 'auto' && '50.0' || inputs.version }} STEAM DF_steam
         if [ "${{ inputs.version }}" = "auto" ]; then
+          while pgrep dwarfort; do
+            echo "waiting for DF to exit"
+            sleep 0.5
+          done
+          cp xml/symbols.xml DF_steam/hack
           cd DF_steam
           DFHACK_DISABLE_CONSOLE=1 ./dfhack &
           while ! ./dfhack-run lua 'print(scr)' | fgrep 'viewscreen_titlest' 2>/dev/null; do
@@ -341,6 +346,7 @@ jobs:
           +login $STEAM_USERNAME \
           "+app_update 975370 $BETA_PARAMS validate" \
           +quit
+        cp xml/symbols.xml DF_steam/hack
         cd DF_steam
         ./Dwarf Fortress.exe &
         while ! ./dfhack-run.exe lua 'print(scr)' | fgrep 'viewscreen_titlest' 2>/dev/null; do
@@ -398,4 +404,4 @@ jobs:
       shell: bash
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: echo gh workflow run steam-deploy.yml -R DFHack/dfhack -r ${{ github.ref }} -f version=${{ env.DETECTED_DF_VER }} -f steam_branch=${{ inputs.steam_branch }}
+      run: gh workflow run steam-deploy.yml -R DFHack/dfhack -r ${{ github.ref }} -f version=${{ env.DETECTED_DF_VER }} -f steam_branch=${{ inputs.steam_branch }}

From ef57a66a241320bea746e7c4ca394743d165532a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 29 Nov 2024 21:17:19 -0800
Subject: [PATCH 2/3] fix cache key used for saving

---
 .github/workflows/watch-df-steam.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/watch-df-steam.yml b/.github/workflows/watch-df-steam.yml
index f5ca2da41d..e2902abb6d 100644
--- a/.github/workflows/watch-df-steam.yml
+++ b/.github/workflows/watch-df-steam.yml
@@ -82,4 +82,4 @@ jobs:
       if: env.TIMESTAMP
       with:
         path: state
-        key: watchstate-${{ matrix.version }}-${{ env.TIMESTAMP }}
+        key: watchstate-${{ matrix.df_steam_branch }}-${{ env.TIMESTAMP }}

From 057c3faa144227018aa4cd23e331856d88bdb19b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 29 Nov 2024 21:23:20 -0800
Subject: [PATCH 3/3] add proper quotes so parentheses are not interpreted

---
 .github/workflows/generate-symbols.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate-symbols.yml b/.github/workflows/generate-symbols.yml
index 00afc26755..f5a6504c7f 100644
--- a/.github/workflows/generate-symbols.yml
+++ b/.github/workflows/generate-symbols.yml
@@ -145,7 +145,7 @@ jobs:
             echo "waiting for DF to start"
             sleep 0.5
           done
-          df_ver=`./dfhack-run lua print(dfhack.gui.getDFViewscreen(true).str_version)`
+          df_ver=`./dfhack-run lua 'print(dfhack.gui.getDFViewscreen(true).str_version)'`
           sed -i "s/v0.50.0 linux64 STEAM/v0.${df_ver} linux64 STEAM/" ../xml/symbols.xml
         fi
 
@@ -353,7 +353,7 @@ jobs:
           echo "waiting for DF to start"
           sleep 0.5
         done
-        df_ver=`./dfhack-run.exe lua print(dfhack.gui.getDFViewscreen(true).str_version)`
+        df_ver=`./dfhack-run.exe lua 'print(dfhack.gui.getDFViewscreen(true).str_version)'`
         sed -i "s/v0.50.0 win64 STEAM/v0.${df_ver} win64 STEAM/" ../xml/symbols.xml
     - name: Merge updates
       shell: bash