Use macOS dmg template on travis.

wesnoth · Mar 12, 2020 · 1487fec · 1487fec
1 parent 046c0a0
commit 1487fec
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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