Improve the mac installer images

AlexProgrammerDE · Feb 23, 2024 · add64a2 · add64a2
1 parent d04e3c7
commit add64a2
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,8 +56,8 @@ jobs:
         run: |
           projectVersion=$(grep '^mavenVersion=' gradle.properties | cut -d'=' -f2)
           projectVersionStripped=${projectVersion/-SNAPSHOT/}
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@jpackage.cfg" "@jpackage-linux.cfg" --type rpm
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@jpackage.cfg" "@jpackage-linux.cfg" --type deb
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-linux.cfg" --type rpm
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-linux.cfg" --type deb
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
@@ -85,7 +85,7 @@ jobs:
         run: |
           $projectVersion = Select-String -Path gradle.properties -Pattern '^mavenVersion=' | ForEach-Object { $_.ToString().Split('=')[1] }
           $projectVersionStripped = $projectVersion -replace '-SNAPSHOT', '' 
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@jpackage.cfg" "@jpackage-windows.cfg"
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-windows.cfg"
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
@@ -109,16 +109,11 @@ jobs:
         with:
           java-version: '21'
           distribution: 'temurin'
-      - name: Prepare environment
-        run: |
-          mkdir mac-resources
-          cp src/main/resources/icons/icon.png mac-resources/SoulFire-background.png
-          cp src/main/resources/icons/icon.png mac-resources/SoulFire-background-darkAqua.png
       - name: Package with jpackage
         run: |
           projectVersion=$(grep '^mavenVersion=' gradle.properties | cut -d'=' -f2)
           projectVersionStripped=${projectVersion/-SNAPSHOT/}
-          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@jpackage.cfg" "@jpackage-mac.cfg"
+          jpackage --app-version $projectVersionStripped --main-jar "SoulFire-$projectVersion.jar" "@installer/jpackage.cfg" "@installer/jpackage-mac.cfg"
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:

diff --git a/jpackage-linux.cfg → installer/jpackage-linux.cfg b/jpackage-linux.cfg → installer/jpackage-linux.cfg
diff --git a/jpackage-mac.cfg → installer/jpackage-mac.cfg b/jpackage-mac.cfg → installer/jpackage-mac.cfg
@@ -1,4 +1,4 @@
 --mac-package-identifier net.pistonmaster.SoulFire
 --icon src/main/resources/icons/icon.icns
---resource-dir mac-resources
+--resource-dir installer/mac
 --type pkg
diff --git a/jpackage-windows.cfg → installer/jpackage-windows.cfg b/jpackage-windows.cfg → installer/jpackage-windows.cfg
diff --git a/jpackage.cfg → installer/jpackage.cfg b/jpackage.cfg → installer/jpackage.cfg
diff --git a/installer/mac/SoulFire-background-darkAqua.png b/installer/mac/SoulFire-background-darkAqua.png
diff --git a/installer/mac/SoulFire-background.png b/installer/mac/SoulFire-background.png
diff --git a/scripts/create-icons.sh b/scripts/create-icons.sh
@@ -27,3 +27,11 @@ convert -background transparent -density 1000 -resize 512x512 \
 src/main/resources/icons/icon.svg output_512x512.png
 png2icns src/main/resources/icons/icon.icns output_*.png
 rm output_*.png
+
+# pkg background
+convert src/main/resources/icons/icon.png \
+-background transparent -density 1000 -resize 123x123^ -gravity center -extent 143x222 \
+installer/mac/SoulFire-background.png
+
+cp installer/mac/SoulFire-background.png \
+installer/mac/SoulFire-background-darkAqua.png
diff --git a/src/main/resources/icons/icon.png b/src/main/resources/icons/icon.png