From bdde71720612f23a3c65c57e9b6650eb4ab854b2 Mon Sep 17 00:00:00 2001
From: Benjamin O <jeep70cp@gmail.com>
Date: Fri, 30 Oct 2020 19:32:04 -0400
Subject: [PATCH] automatically generate nice dmgs

---
 ci/deploy.yml              | 12 +++++++++++-
 dist/mac/Info.plist        |  2 ++
 dist/mac/Info_legacy.plist |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ci/deploy.yml b/ci/deploy.yml
index 63ab9e65..a4029571 100644
--- a/ci/deploy.yml
+++ b/ci/deploy.yml
@@ -42,16 +42,26 @@ steps:
   displayName: 'Run windeployqt'
 
 - script: |
+    if [ $(nightlyString) == -nightly ]; then
+          VERSION=$(Build.BuildNumber)
+    else
+          VERSION=$(sed -n 's/[^0-9.]*//g;2p' qView.pro)
+    fi
+    
     cd bin
 
     cp $(Qt5_DIR)/plugins/imageformats/libqapng.dylib qView.app/Contents/PlugIns/imageformats/
     cp $(Qt5_DIR)/plugins/imageformats/libqavif.dylib qView.app/Contents/PlugIns/imageformats/
     
+    macdeployqt qView.app
     if [ $(nightlyString) == -nightly ]; then
         mv qView.app 'qView$(nightlyString)$(buildNumString).app'
+        macdeployqt *.app -dmg
+    else
+        brew install create-dmg
+        create-dmg --volname "qView $VERSION" --window-size 660 400 --icon-size 160 --icon "qView.app" 180 170 --hide-extension qView.app --app-drop-link 480 170 "qView-$VERSION.dmg" "qView.app"
     fi
 
-    macdeployqt *.app -dmg
     rm -r *.app
   condition: and(succeeded(), ne( variables['skipDeploy'], 'true' ), eq( variables['Agent.OS'], 'Darwin' ))
   displayName: 'Run macdeployqt'
diff --git a/dist/mac/Info.plist b/dist/mac/Info.plist
index 4ac5564c..ecf78686 100644
--- a/dist/mac/Info.plist
+++ b/dist/mac/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleName</key>
+	<string>qView</string>
 	<key>CFBundleGetInfoString</key>
 	<string>${QMAKE_SHORT_VERSION}</string>
 	<key>CFBundleIconFile</key>
diff --git a/dist/mac/Info_legacy.plist b/dist/mac/Info_legacy.plist
index ee7590bd..93043bb1 100644
--- a/dist/mac/Info_legacy.plist
+++ b/dist/mac/Info_legacy.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
+	<key>CFBundleName</key>
+	<string>qView</string>
 	<key>CFBundleGetInfoString</key>
 	<string>@SHORT_VERSION@</string>
 	<key>CFBundleIconFile</key>