Merge branch 'develop' into adv-beta

DFHack · Nov 30, 2024 · 190864d · 190864d
2 parents 3a28bf3 + 9200479
commit 190864d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/generate-symbols.yml b/.github/workflows/generate-symbols.yml
@@ -148,7 +148,7 @@ jobs:
           df_ver=`./dfhack-run lua 'print(dfhack.gui.getDFViewscreen(true).str_version)' | ansifilter`
           echo "Found version string: '$df_ver'"
           sed -i "s/v0.50.0 linux64 STEAM/v0.$df_ver linux64 STEAM/" ../xml/symbols.xml
-          ./dfhack-run die
+          ./dfhack-run die || true
         fi
 
     # Itch
@@ -354,15 +354,15 @@ jobs:
         tar xjf dfhack-symbols-windows64-build.tar.bz2 -C DF_steam
         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
+        "./Dwarf Fortress.exe" &
+        while ! ./dfhack-run.exe lua 'print(scr)' | fgrep 'viewscreen_titlest' 2>/dev/null; do
           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)'`
         echo "Found version string: '$df_ver'"
         sed -i "s/v0.50.0 win64 STEAM/v0.$df_ver win64 STEAM/" ../xml/symbols.xml
-        dfhack-run.exe die
+        ./dfhack-run.exe die || true
     - name: Merge updates
       shell: bash
       run: |