From d12134d326351eecef86a6e694153a4152f4899c Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Thu, 9 Jun 2022 11:21:14 -0700
Subject: [PATCH] check for files, not md5 receipt in download-df.sh (#2196)

---
 .github/workflows/build.yml |  2 +-
 ci/download-df.sh           | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21b3096d3..2c710d91a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/DF
-        key: ${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
+        key: dfcache-${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
     - name: Fetch ccache
       uses: actions/cache@v2
       with:
diff --git a/ci/download-df.sh b/ci/download-df.sh
index 2fd095c1d..bb1e91759 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -5,9 +5,6 @@ set -e
 df_tardest="df.tar.bz2"
 save_tardest="test_save.tgz"
 
-selfmd5=$(openssl md5 < "$0")
-echo $selfmd5
-
 cd "$(dirname "$0")"
 echo "DF_VERSION: $DF_VERSION"
 echo "DF_FOLDER: $DF_FOLDER"
@@ -15,17 +12,7 @@ mkdir -p "$DF_FOLDER"
 # back out of df_linux
 cd "$DF_FOLDER/.."
 
-if [ -f receipt ]; then
-    if [ "$selfmd5" != "$(cat receipt)" ]; then
-        echo "download-df.sh changed; re-downloading tarballs"
-        rm receipt
-    else
-        echo "Already downloaded $DF_VERSION tarballs"
-    fi
-fi
-
-if [ ! -f receipt ]; then
-    rm -f "$df_tardest" "$save_tardest"
+if ! test -f "$df_tardest"; then
     minor=$(echo "$DF_VERSION" | cut -d. -f2)
     patch=$(echo "$DF_VERSION" | cut -d. -f3)
     echo "Downloading DF $DF_VERSION"
@@ -43,6 +30,7 @@ URLS
         echo "DF failed to download: $df_tardest not found"
         exit 1
     fi
+
     echo "Downloading test save"
     #test_save_url="https://files.dfhack.org/DF/0.${minor}.${patch}/test_save.tgz"
     test_save_url="https://drive.google.com/uc?export=download&id=1XvYngl-DFONiZ9SD9OC4B2Ooecu8rPFz"
@@ -61,5 +49,4 @@ tar xf "$df_tardest" --strip-components=1 -C df_linux
 tar xf "$save_tardest" -C df_linux/data/save
 echo Done
 
-echo "$selfmd5" > receipt
-ls
+ls -l