From e14bef1619a28b1920fd153fdd7fa4601f4dbaf3 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 4 Oct 2022 20:39:14 +0200
Subject: [PATCH] Fix unzip, allow to overwrite .daw-meta.xml file

---
 tools/linux_packaging/build | 4 ++--
 tools/x-win/package.sh      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index e4fcd350c1..d19109f583 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -739,7 +739,7 @@ if test -n "$MIXBUS"; then
 	if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then
 		echo "Adding Mixbus Bundled Content"
 		rm -f "${MediaClips}/"*.*
-		unzip -q -d "${MediaClips}" "${CACHEDIR}/MixbusBundledMedia.zip"
+		unzip -q -o -d "${MediaClips}" "${CACHEDIR}/MixbusBundledMedia.zip"
 	fi
 else
     echo "Fetching Ardour bundled content"
@@ -751,7 +751,7 @@ else
     if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then
 	echo "Adding Ardour Bundled Content"
 	rm -f "${MediaClips}/"*.*
-	unzip -q -d "${MediaClips}" "${CACHEDIR}/ArdourBundledMedia.zip"
+	unzip -q -o -d "${MediaClips}" "${CACHEDIR}/ArdourBundledMedia.zip"
     fi
 fi
 
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index cb22c796d1..a865d643a8 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -360,7 +360,7 @@ if test -n "$MIXBUS"; then
 	if test -f "${SRCCACHE}/MixbusBundledMedia.zip"; then
 		echo "Adding Mixbus Bundled Content"
 		rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/media/*.*
-		unzip -q -d "$DESTDIR/share/${LOWERCASE_DIRNAME}/media/" "${SRCCACHE}/MixbusBundledMedia.zip"
+		unzip -q -o -d "$DESTDIR/share/${LOWERCASE_DIRNAME}/media/" "${SRCCACHE}/MixbusBundledMedia.zip"
 	fi
 else
         echo "Fetching Ardour bundled media"
@@ -372,7 +372,7 @@ else
 	if test -f "${SRCCACHE}/ArdourBundledMedia.zip"; then
 		echo "Adding Ardour Bundled Content"
 		rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/media/*.*
-		unzip -q -d "$DESTDIR/share/${LOWERCASE_DIRNAME}/media/" "${SRCCACHE}/ArdourBundledMedia.zip"
+		unzip -q -o -d "$DESTDIR/share/${LOWERCASE_DIRNAME}/media/" "${SRCCACHE}/ArdourBundledMedia.zip"
 	fi
 fi