Remove create-dmg.sh script and use create-dmg directly from CMake

.gitignore

@@ -104,7 +104,6 @@ Thumbs.db
 
 # Stuff in dist
 maketarball.sh
-create-dmg.sh
 changelog
 PKGBUILD
 

cmake/Dmg.cmake

@@ -1,6 +1,6 @@
 add_custom_target(dmg
   COMMAND /usr/local/opt/qt5/bin/macdeployqt strawberry.app
   COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
-  COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/create-dmg.sh strawberry.app
+  COMMAND create-dmg --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}.dmg strawberry.app
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )

debian/rules

@@ -5,7 +5,6 @@
 
 override_dh_auto_clean:
 	rm -f dist/macos/Info.plist
-	rm -f dist/macos/create-dmg.sh
 	rm -f dist/unix/PKGBUILD
 	rm -f dist/unix/strawberry.spec
 	rm -f dist/scripts/maketarball.sh

dist/CMakeLists.txt

@@ -3,7 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOUR
 
 if (APPLE)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh)
 endif (APPLE)
 
 if (WIN32)

dist/macos/create-dmg.sh.in

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-version="@STRAWBERRY_VERSION_PACKAGE@"
-
-if [ -z "$1" ]; then
-    echo "Usage: $0 <bundle.app> (append)"
-    exit 1
-fi
-
-name=$(basename "$1" | perl -pe 's/(.*).app/\1/')
-bundle_dir="$1"
-temp_dir="dmg/$name"
-if [ -z "$2" ]; then
-  output_file="$name-$version.dmg"
-else
-  output_file="$name-$2-$version.dmg"
-fi
-
-rm -rf "$temp_dir"
-rm -f "$output_file"
-
-mkdir -p "$temp_dir"
-
-/usr/local/bin/create-dmg --volname "$name" --background "@CMAKE_SOURCE_DIR@/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon $bundle_dir 150 218 --window-size 600 450 $output_file $bundle_dir

dist/scripts/maketarball.sh.in

@@ -38,7 +38,6 @@ tar -cJf $name-$version.tar.xz \
     --exclude="$root/debian/changelog" \
     --exclude="$root/dist/scripts/maketarball.sh" \
     --exclude="$root/dist/unix/PKGBUILD" \
-    --exclude="$root/dist/macos/create-dmg.sh" \
     --exclude="$root/dist/macos/Info.plist" \
     --exclude="$root/dist/windows/windres.rc" \
     --exclude="$root/src/translations/translations.pot" \