From ac01c480f076df8310ff55aa5caa430e54c8fbcd Mon Sep 17 00:00:00 2001
From: Pekka Helenius <pekka.helenius@fjordtek.com>
Date: Fri, 28 Oct 2022 21:32:01 +0300
Subject: [PATCH] [Arch] Update patch file copy logic

---
 arch/updatewine_arch.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/arch/updatewine_arch.sh b/arch/updatewine_arch.sh
index c6877bd..7815640 100755
--- a/arch/updatewine_arch.sh
+++ b/arch/updatewine_arch.sh
@@ -252,9 +252,21 @@ $(for o in ${ERRPKGS[@]}; do printf '%s\n' ${o}; done)\
 
 function prepare_env() {
 
-  # Copy Wine & DXVK patch files
-  cp -rf ${ARCH_BUILDROOT}/../wine_custom_patches ${ARCH_BUILDROOT}/0-wine-staging-git/wine-patches
-  cp -rf ${ARCH_BUILDROOT}/../dxvk_custom_patches ${ARCH_BUILDROOT}/0-dxvk-git/dxvk-patches
+  # Remove old Wine & DXVK patch files
+  rm -rf ${ARCH_BUILDROOT}/0-wine-staging-git/wine-patches
+  rm -rf ${ARCH_BUILDROOT}/0-dxvk-git/dxvk-patches
+  
+  mkdir -p ${ARCH_BUILDROOT}/0-wine-staging-git/wine-patches
+  mkdir -p ${ARCH_BUILDROOT}/0-dxvk-git/dxvk-patches
+  
+  # Copy new Wine & DXVK patch files
+  find ${ARCH_BUILDROOT}/../wine_custom_patches \
+    -mindepth 1 -maxdepth 1 -type f \( -iname "*.patch" -or -iname "*.diff" \) \
+    -exec cp {} ${ARCH_BUILDROOT}/0-wine-staging-git/wine-patches/ \;
+
+  find ${ARCH_BUILDROOT}/../dxvk_custom_patches \
+    -mindepth 1 -maxdepth 1 -type f \( -iname "*.patch" -or -iname "*.diff" \) \
+    -exec cp {} ${ARCH_BUILDROOT}/0-dxvk-git/dxvk-patches \;
 
   # Create identifiable directory for this build
   mkdir -p ${ARCH_BUILDROOT}/compiled_pkg/"${datedir}"