From 5c39791b63c15fbbe9761bf031d8aee1d7bd24a3 Mon Sep 17 00:00:00 2001 From: Matthew Fennell Date: Sun, 18 Oct 2026 21:21:47 +0100 Subject: Remove GNU-isms from CSQLite checker macOS by default doesn't have GNU find or wget - see https://github.com/monal-im/Monal/pull/1744#issuecomment-6253201648 Use a safe subset of find syntax, and curl instead of wget, to work around Apple's dislike of the GPL. --- csqlite/check-matches-upstream.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/csqlite/check-matches-upstream.sh b/csqlite/check-matches-upstream.sh index 9f11502..26e48db 100755 --- a/csqlite/check-matches-upstream.sh +++ b/csqlite/check-matches-upstream.sh @@ -36,8 +36,8 @@ cd "${working_dir}/csqlite-reference" git checkout "${known_safe_commit}" cd "${working_dir}" -wget "${amalgamation_url}" --output-document amalgamation.zip -wget "${src_url}" --output-document src.zip +curl "${amalgamation_url}" --output amalgamation.zip +curl "${src_url}" --output src.zip amalgamation_calculated_hash=$(openssl dgst -sha3-256 amalgamation.zip | cut -d = -f 2 | sed 's/ //g') src_calculated_hash=$(openssl dgst -sha3-256 src.zip | cut -d = -f 2 | sed 's/ //g') @@ -84,8 +84,11 @@ diff --unified --color csqlite-reference/Tests/CSQLiteTests/CSQLiteExtensionTest diff --unified --color csqlite-reference/Tests/CSQLiteTests/CSQLiteFeatureTests.swift csqlite-new/Tests/CSQLiteTests/CSQLiteFeatureTests.swift # Compare directory structure, check for newly created files -find csqlite-reference -printf "%P\n" | sort > csqlite-reference.files -find csqlite-new -printf "%P\n" | sort > csqlite-new.files +cd "${working_dir}/csqlite-reference" +find . | sort > "${working_dir}/csqlite-reference.files" +cd "${working_dir}/csqlite-new" +find . | sort > "${working_dir}/csqlite-new.files" +cd "${working_dir}" diff --unified --color csqlite-reference.files csqlite-new.files echo "No differences found" -- cgit v1.2.3