From d7f00481e9b428cd231c2fd3299db3a7c5edf539 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sat, 18 Oct 2025 22:35:47 -0500
Subject: [PATCH] fix darwin copy to fuse drives

---
 .gitignore             |  1 +
 src/scripts/deliver.sh | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 486ec65..610c9d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ scripts/cleanup.sh
 support/Dockerfile
 version.cpp
 version.rc
+.DS_Store
diff --git a/src/scripts/deliver.sh b/src/scripts/deliver.sh
index 0cef9cb..c72f5f2 100755
--- a/src/scripts/deliver.sh
+++ b/src/scripts/deliver.sh
@@ -7,6 +7,11 @@ PROJECT_SCRIPTS_DIR=$(realpath "$0")
 PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
 
+COPY_OPS=-f
+if [ "${PROJECT_IS_DARWIN}" == "1" ]; then
+  COPY_OPS="${COPY_OPS} -X"
+fi
+
 function error_exit() {
   echo $1
   exit $2
@@ -65,39 +70,39 @@ if [ "${PROJECT_PRIVATE_KEY}" != "" ] && [ ! -f "./${PROJECT_OUT_FILE}.sig" ]; t
   error_exit "failed to find file: ${PROJECT_OUT_FILE}.sig" 1
 fi
 
-cp -f ./${PROJECT_OUT_FILE} ${DEST_DIR} ||
+cp ${COPY_OPS} ./${PROJECT_OUT_FILE} ${DEST_DIR} ||
   error_exit "failed to deliver file: ${PROJECT_OUT_FILE}" 1
 
-cp -f ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} ||
+cp ${COPY_OPS} ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} ||
   error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sha256" 1
 
 if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-  cp -f ./${PROJECT_OUT_FILE}.sig ${DEST_DIR} ||
+  cp ${COPY_OPS} ./${PROJECT_OUT_FILE}.sig ${DEST_DIR} ||
     error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sig" 1
 fi
 
 if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ]; then
-  cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ${DEST_DIR} ||
     error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}" 1
 
-  cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" ${DEST_DIR} ||
     error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" 1
 
   if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-    cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" ${DEST_DIR} ||
+    cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" ${DEST_DIR} ||
       error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" 1
   fi
 fi
 
 if [ "${PROJECT_IS_DARWIN}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ]; then
-  cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ${DEST_DIR} ||
     error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" 1
 
-  cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" ${DEST_DIR} ||
     error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" 1
 
   if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-    cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" ${DEST_DIR} ||
+    cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" ${DEST_DIR} ||
       error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" 1
   fi
 fi