From 27b5d1e02279716e6f799064d1ca5c563e35f3d1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 3 Aug 2023 04:37:13 -0700
Subject: [PATCH] more windows fixups

---
 .github/workflows/test.yml | 2 +-
 ci/download-df.sh          | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 357196181..3490ff6a6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,7 +60,7 @@ jobs:
           ci/
     - name: Detect DF version
       id: get-df-version
-      run: echo ver="$(sh ci/get-df-version.sh)" >> $GITHUB_OUTPUT
+      run: echo ver="$(sh ci/get-df-version.sh)" >> $env:GITHUB_OUTPUT
     - name: Fetch DF cache
       id: restore-df
       uses: actions/cache/restore@v3
diff --git a/ci/download-df.sh b/ci/download-df.sh
index 0f7a5517b..13c432798 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -10,10 +10,12 @@ minor=$(echo "$DF_VERSION" | cut -d. -f1)
 patch=$(echo "$DF_VERSION" | cut -d. -f2)
 df_url="https://www.bay12games.com/dwarves/df_${minor}_${patch}"
 if test "$OS_TARGET" = "windows"; then
+    WGET="C:/msys64/usr/bin/wget.exe"
     df_url="${df_url}_win_s.zip"
     df_archive_name="df.zip"
     df_extract_cmd="unzip -d ${DF_FOLDER}"
 elif test "$OS_TARGET" = "linux"; then
+    WGET=wget
     df_url="${df_url}_linux.tar.bz2"
     df_archive_name="df.tar.bz2"
     df_extract_cmd="tar -x -j --strip-components=1 -f"
@@ -22,7 +24,7 @@ else
     exit 1
 fi
 
-if ! wget -v "$df_url" -O "$df_archive_name"; then
+if ! $WGET -v "$df_url" -O "$df_archive_name"; then
     echo "Failed to download DF from $df_url"
     exit 1
 fi
@@ -31,7 +33,7 @@ save_url="https://dffd.bay12games.com/download.php?id=15434&f=dreamfort.7z"
 save_archive_name="test_save.7z"
 save_extract_cmd="7z x -oDF/save"
 
-if ! wget -v "$save_url" -O "$save_archive_name"; then
+if ! $WGET -v "$save_url" -O "$save_archive_name"; then
     echo "Failed to download test save from $save_url"
     exit 1
 fi