From e2d8e82699fca6fed36a34b7374c31313df2f514 Mon Sep 17 00:00:00 2001
From: Alexander Diamadis <alex@aldiserver.de>
Date: Sun, 20 Feb 2022 11:56:55 +0100
Subject: [PATCH] Optimized Installer creating on macos

---
 .gitignore                                    |  1 +
 installer/config/config.xml                   |  2 +-
 installer/createInstaller_mac.sh              | 26 +++++++++++++++++++
 .../com.dkmtech.installer/meta/package.xml    |  2 +-
 .../com.dkmtech.pacalculator/meta/package.xml |  4 +--
 source/PA_Calculator.pro                      |  2 +-
 6 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100755 installer/createInstaller_mac.sh

diff --git a/.gitignore b/.gitignore
index 6e4009d..708e16f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ build*
 /installer/packages/com.dkmtech.pacalculator/data/*
 *.exe
 *.app
+*.dmg
diff --git a/installer/config/config.xml b/installer/config/config.xml
index 8d7fef5..5ba02ca 100644
--- a/installer/config/config.xml
+++ b/installer/config/config.xml
@@ -5,5 +5,5 @@
     <Title>PA Calculator Installer</Title>
     <Publisher>DKM-Tech</Publisher>
     <StartMenuDir>DKM-Tech</StartMenuDir>
-    <TargetDir>@ApplicationsDirX64@/PA Calculator</TargetDir>
+    <TargetDir>/Applications/PA Calculator</TargetDir>
 </Installer>
diff --git a/installer/createInstaller_mac.sh b/installer/createInstaller_mac.sh
new file mode 100755
index 0000000..5750539
--- /dev/null
+++ b/installer/createInstaller_mac.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+releaseFolder=$(find ../ -path "*-Release" -type d)
+fileName="${releaseFolder}/PA Calculator.app"
+if [[ -e $fileName ]]; then
+	rm -rf "PA Calculator.app"
+	rm -rf "Install PA Calculator.app"
+	rm -rf setup64bit.dmg
+	cp -R "${fileName}" "PA Calculator.app"
+	macdeployqt 'PA Calculator.app'
+	VERSION=$(grep VERSION= "../source/PA_Calculator.pro" | awk -F= '{print $2;exit}')
+	echo "verwendet Version $VERSION"
+	DATE=$(date +%F)
+	sed -i '' 's/<Version>.*<\/Version>/<Version>'"$VERSION"'<\/Version>/g' packages/com.dkmtech.pacalculator/meta/package.xml
+	sed -i '' 's/<ReleaseDate>.*<\/ReleaseDate>/<ReleaseDate>'"$DATE"'<\/ReleaseDate>/g' packages/com.dkmtech.pacalculator/meta/package.xml
+	rm -rf packages/com.dkmtech.pacalculator/data
+	mkdir packages/com.dkmtech.pacalculator/data
+	cp -R 'PA Calculator.app' 'packages/com.dkmtech.pacalculator/data/PA Calculator.app'
+	binarycreator -c config/config.xml -p packages 'Install PA Calculator'
+	rm -rf 'PA Calculator.app'
+	hdiutil create -srcfolder "Install PA Calculator.app" setup64bit.dmg
+	rm -rf "Install PA Calculator.app"
+	echo "Done"
+else
+	echo "Could not find PA Calculator.app. Please build it first!"
+fi
+
diff --git a/installer/packages/com.dkmtech.installer/meta/package.xml b/installer/packages/com.dkmtech.installer/meta/package.xml
index 94b7f57..199fac1 100644
--- a/installer/packages/com.dkmtech.installer/meta/package.xml
+++ b/installer/packages/com.dkmtech.installer/meta/package.xml
@@ -6,5 +6,5 @@
     <ReleaseDate>2022-02-06</ReleaseDate>
     <Name>com.dkmtech.installer</Name>
     <Virtual>true</Virtual>
-    <UpdateText>First Installer</UpdateText>
+    <UpdateText>DKM-Teh Installer</UpdateText>
 </Package>
\ No newline at end of file
diff --git a/installer/packages/com.dkmtech.pacalculator/meta/package.xml b/installer/packages/com.dkmtech.pacalculator/meta/package.xml
index 5f25ae1..296b526 100644
--- a/installer/packages/com.dkmtech.pacalculator/meta/package.xml
+++ b/installer/packages/com.dkmtech.pacalculator/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>PA-Calculator</DisplayName>
     <Description>Install PA-Calculator</Description>
-    <Version>1.1</Version>
-    <ReleaseDate>2022-02-06</ReleaseDate>
+    <Version>1.1.2</Version>
+    <ReleaseDate>2022-02-20</ReleaseDate>
     <Licenses>
         <License name="GNU GENERAL PUBLIC LICENSE" file="license.txt" />
     </Licenses>
diff --git a/source/PA_Calculator.pro b/source/PA_Calculator.pro
index ee3ce9e..26275b4 100644
--- a/source/PA_Calculator.pro
+++ b/source/PA_Calculator.pro
@@ -55,7 +55,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 RESOURCES += \
     resources.qrc
 
-VERSION=1.1.0
+VERSION=1.1.2
 QMAKE_TARGET_PRODUCT = "PA-Calculator"
 QMAKE_TARGET_COMPANY = "DKM-Tech"
 QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2022 by Alexander Diamadis"