From 1487fec273a2f43d7980559f93426b3b74af0c0b Mon Sep 17 00:00:00 2001
From: Pentarctagon <pentarctagon@tutamail.com>
Date: Mon, 9 Mar 2020 09:54:33 -0500
Subject: [PATCH] Use macOS dmg template on travis.

---
 utils/travis/steps/script.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh
index ecacca00d8d3..638981149830 100755
--- a/utils/travis/steps/script.sh
+++ b/utils/travis/steps/script.sh
@@ -9,9 +9,11 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     BUILD_RET=$?
 
     if [ "$UPLOAD_ID" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-# workaround for a bug in hdiutil where it freezes if multiple srcfolder-s are specified
-        cp -R "build/$CFG/The Battle for Wesnoth.app" "../../packaging/macos/The Battle for Wesnoth.app"
-        hdiutil create -volname "Wesnoth_${CFG}" -fs 'HFS+' -srcfolder ../../packaging/macos -ov -format UDBZ "Wesnoth_${CFG}.dmg"
+        hdiutil convert ../../packaging/macOS/Wesnoth_dmg_packaging_template.dmg -format UDRW -o "Wesnoth_RW.dmg"
+        hdiutil attach "Wesnoth_RW.dmg"
+        cp -R "build/$CFG/The Battle for Wesnoth.app/." "/Volumes/The Battle for Wesnoth/The Battle for Wesnoth.app"
+        hdiutil detach "/Volumes/The Battle for Wesnoth"
+        hdiutil convert "Wesnoth_RW.dmg" -format UDBZ -o "Wesnoth_${CFG}.dmg"
         ./../../utils/travis/sftp "Wesnoth_${CFG}.dmg"
     fi