MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more windows fixups

develop
Myk Taylor 2023-08-03 04:37:13 -07:00
parent 59a2d3a524
commit 27b5d1e022
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
Unescape Escape View File

@ -60,7 +60,7 @@ jobs:
ci/ ci/
- name: Detect DF version - name: Detect DF version
id: get-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 - name: Fetch DF cache
id: restore-df id: restore-df
uses: actions/cache/restore@v3 uses: actions/cache/restore@v3

6
ci/download-df.sh
Unescape Escape View File

@ -10,10 +10,12 @@ minor=$(echo "$DF_VERSION" | cut -d. -f1)
patch=$(echo "$DF_VERSION" | cut -d. -f2) patch=$(echo "$DF_VERSION" | cut -d. -f2)
df_url="https://www.bay12games.com/dwarves/df_${minor}_${patch}" df_url="https://www.bay12games.com/dwarves/df_${minor}_${patch}"
if test "$OS_TARGET" = "windows"; then if test "$OS_TARGET" = "windows"; then
WGET="C:/msys64/usr/bin/wget.exe"
df_url="${df_url}_win_s.zip" df_url="${df_url}_win_s.zip"
df_archive_name="df.zip" df_archive_name="df.zip"
df_extract_cmd="unzip -d ${DF_FOLDER}" df_extract_cmd="unzip -d ${DF_FOLDER}"
elif test "$OS_TARGET" = "linux"; then elif test "$OS_TARGET" = "linux"; then
WGET=wget
df_url="${df_url}_linux.tar.bz2" df_url="${df_url}_linux.tar.bz2"
df_archive_name="df.tar.bz2" df_archive_name="df.tar.bz2"
df_extract_cmd="tar -x -j --strip-components=1 -f" df_extract_cmd="tar -x -j --strip-components=1 -f"
@ -22,7 +24,7 @@ else
exit 1 exit 1
fi 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" echo "Failed to download DF from $df_url"
exit 1 exit 1
fi 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_archive_name="test_save.7z"
save_extract_cmd="7z x -oDF/save" 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" echo "Failed to download test save from $save_url"
exit 1 exit 1
fi fi