From 6f10253846bb8fdc59b6ce28807ac27e478a8001 Mon Sep 17 00:00:00 2001
From: ESPRI DIGITAL <espridigital@ESPRIs-Mac-mini.local>
Date: Tue, 7 Jun 2022 09:08:37 +0200
Subject: [PATCH 1/2] Mac Installer

---
 Mac-build/.DS_Store      | Bin 0 -> 6148 bytes
 Mac-build/EasyInstaller  |   4 ++++
 Mac-build/mac_package.sh |  15 +++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 Mac-build/.DS_Store
 create mode 100644 Mac-build/EasyInstaller
 create mode 100755 Mac-build/mac_package.sh

diff --git a/Mac-build/.DS_Store b/Mac-build/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0f484756d5c2670a7487eced5a74585c42287ea9
GIT binary patch
literal 6148
zcmeHKyG{c!5S)b+kq{^)rN1B&e_*1dNX-WT2?!)E1Q96cuH$p~M3{Ymaye)zU{~55
zKX&Z9DZDlSnLJ;e03!fHx*}dR^iAj0d$t!NiehWbagPn2aEYdu{r!M)4>2QSgBNV`
z8(iaY-mI64X1!pRe&Q*8{BFh;aD)|^OPu4u@Q(3@yfIh1-Qm9NaBYDMsX!`_3Zw$5
zz`s*~HCt_X;FvKLNCi@XF9q~`D0Iad*gD$L!JyZ7ogXNwv2AY&Vu^kYY#lj66Q>fL
zD)Gb+r*phSUJYy=oer^`xlZgX@j?;Xo#VyQA=NQsDv%0v71;OgNbCQM{=@sfOUhm<
zkP7@M1!OQin@;#kQCoXIr?s}wFX*4fTuW!@Tmsn9QhdCXSG3K%8rV7-o#RF)=0!kt
KNlOKOLxB(GA}go>

literal 0
HcmV?d00001

diff --git a/Mac-build/EasyInstaller b/Mac-build/EasyInstaller
new file mode 100644
index 00000000..dbfbb56f
--- /dev/null
+++ b/Mac-build/EasyInstaller
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+DIR="${0%/*}"
+"$DIR/bin/java"  -p "$DIR/../app" -m ecorp.easy.installer/ecorp.easy.installer.EasyInstaller  "$@"
diff --git a/Mac-build/mac_package.sh b/Mac-build/mac_package.sh
new file mode 100755
index 00000000..116dfbbb
--- /dev/null
+++ b/Mac-build/mac_package.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+APPNAME=EasyInstaller
+DIR="$APPNAME.app/Contents/MacOS"
+
+if [ -a "$APPNAME.app" ]; then
+	echo "$PWD/$APPNAME.app already exists :("
+	exit 1
+fi
+
+mkdir -p "$DIR"
+cp EasyInstaller "$DIR/$APPNAME"
+chmod +x "$DIR/$APPNAME"
+
+cp -r ../build/image/easy-installer-mac/* "$DIR"
-- 
GitLab


From 4cb8844da277b9ce8c5adfc3428f72d4b25cbdb0 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 8 Jun 2022 15:39:43 +0200
Subject: [PATCH 2/2] add mac_package.sh call for OSX

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fba0a807..f3aa59eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,10 +91,12 @@ build-macos:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
     - ./gradlew jlink
+    - cd Mac-build
+    - ./mac_package.sh
   artifacts:
     name: "easy-installer-mac"
     paths:
-      - build/image/easy-installer-mac/*
+      - Mac-build/EasyInstaller.app
 
 build-aur:
   image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG
-- 
GitLab