Merge branch 'develop' into 'main'

Develop

See merge request Griefed/ServerPackCreator!601

.github/workflows/devbuild.yml

@@ -41,15 +41,25 @@ jobs:
           ./gradlew build --info --full-stacktrace
           ./gradlew media --info --full-stacktrace
 
+      - name: Collect files
+        run: |
+          mkdir continuous
+          cp serverpackcreator-api/build/libs/*.jar continuous/
+          cp serverpackcreator-app/build/libs/*.jar continuous/
+          cp serverpackcreator-plugin-example/build/libs/*.jar continuous/
+          cp media/*.dmg continuous/
+          cp media/*.sh continuous/
+          cp media/*.exe continuous/
+
       - name: Generate checksum
         uses: jmgilman/actions-generate-checksum@v1
         with:
           patterns: |
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/serverpackcreator-app-dev.jar
-            serverpackcreator-plugin-example/build/libs/serverpackcreator-plugin-example-dev.jar
+            continuous/*
+
+      - name: Collect checksum
+        run: |
+          cp checksum.txt continuous/
 
       - name: Upload to GitHub Releases
         uses: "marvinpinto/action-automatic-releases@latest"
@@ -59,20 +69,12 @@ jobs:
           prerelease: true
           title: "Development Build"
           files: |
-            ./checksum.txt
-            ./media/*.dmg
-            ./media/*.sh
-            ./media/*.exe
-            ./serverpackcreator-app/build/libs/serverpackcreator-app-dev.jar
-            ./serverpackcreator-plugin-example/build/libs/serverpackcreator-plugin-example-dev.jar
+            continuous/*
 
-      - name: Collect files
+      - name: Get source archives
         run: |
-          mkdir continuous
-          cp serverpackcreator-api/build/libs/*.jar continuous/
-          cp serverpackcreator-app/build/libs/*.jar continuous/
-          cp serverpackcreator-plugin-example/build/libs/*.jar continuous/
-          cp media/* continuous/
+          wget -O continuous/source.zip https://github.com/Griefed/ServerPackCreator/archive/refs/tags/continuous.zip
+          wget -O continuous/source.tar.gz https://github.com/Griefed/ServerPackCreator/archive/refs/tags/continuous.tar.gz
 
       - name: Cleanup continuous
         id: action-ssh

.github/workflows/github-prerelease.yml

@@ -71,6 +71,29 @@ jobs:
           ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" build --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-app:test
           ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" media --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-app:test
 
+      - name: Rename JAR and Plugin
+        run: |
+          mv serverpackcreator-app/build/libs/serverpackcreator-app-${{ needs.preparations.outputs.version }}.jar serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
+          mv serverpackcreator-plugin-example/build/libs/serverpackcreator-plugin-example-${{ needs.preparations.outputs.version }}.jar serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
+
+      - name: Collect files
+        run: |
+          mkdir ${{ needs.preparations.outputs.version }}
+          cp serverpackcreator-api/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
+          cp serverpackcreator-app/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
+          cp serverpackcreator-plugin-example/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
+          cp media/* ${{ needs.preparations.outputs.version }}/
+
+      - name: Generate checksum
+        uses: jmgilman/actions-generate-checksum@v1
+        with:
+          patterns: |
+            ${{ needs.preparations.outputs.version }}/*
+
+      - name: Collect checksum
+        run: |
+          cp checksum.txt ${{ needs.preparations.outputs.version }}/
+
       # UPLOAD ARTIFACTS
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
@@ -84,22 +107,13 @@ jobs:
             serverpackcreator-plugin-example/build
           if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
 
-      - name: Rename JAR and Plugin
-        run: |
-          mv serverpackcreator-app/build/libs/serverpackcreator-app-${{ needs.preparations.outputs.version }}.jar serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-          mv serverpackcreator-plugin-example/build/libs/serverpackcreator-plugin-example-${{ needs.preparations.outputs.version }}.jar serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
-
       # UPLOAD ARTIFACTS
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: jar-media-release
           path: |
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-            serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
+            ${{ needs.preparations.outputs.version }}
           if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
 
   prerelease:
@@ -155,18 +169,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: jar-media-release
+          path: ${{ needs.preparations.outputs.version }}
 
-      - name: Generate checksum
-        uses: jmgilman/actions-generate-checksum@v1
-        with:
-          patterns: |
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-            serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
-
-      - name: Append Checksums Info
+      - name: Append Info
         uses: DamianReeves/[email protected]
         with:
           path: description.txt
@@ -188,12 +193,21 @@ jobs:
           prerelease: true
           fail_on_unmatched_files: false
           files: |
-            checksum.txt
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-            serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
+            ${{ needs.preparations.outputs.version }}/*
+
+      - name: Get source archives
+        run: |
+          wget -O ${{ needs.preparations.outputs.version }}/source.zip https://github.com/Griefed/ServerPackCreator/archive/refs/tags/${{ needs.preparations.outputs.version }}.zip
+          wget -O ${{ needs.preparations.outputs.version }}/source.tar.gz https://github.com/Griefed/ServerPackCreator/archive/refs/tags/${{ needs.preparations.outputs.version }}.tar.gz
+
+      - name: Upload release to version-dir
+        uses: nogsantos/scp-deploy@master
+        with:
+          src: ./${{ needs.preparations.outputs.version }}
+          host: ${{ secrets.SPCUPLOAD_HOST }}
+          remote: "${{ secrets.SPCUPLOAD_TARGET }}"
+          user: ${{ secrets.SPCUPLOAD_USERNAME }}
+          key: ${{ secrets.SPCUPLOAD_KEY }}
 
   news:
     name: "News on Discord"

.github/workflows/github_release.yml

@@ -69,6 +69,28 @@ jobs:
           ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" build --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-app:test
           ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" media --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-app:test
 
+      - name: Rename JAR and Plugin
+        run: |
+          mv serverpackcreator-app/build/libs/serverpackcreator-app-${{ needs.preparations.outputs.version }}.jar serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
+          mv serverpackcreator-plugin-example/build/libs/serverpackcreator-plugin-example-${{ needs.preparations.outputs.version }}.jar serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
+
+      - name: Collect files
+        run: |
+          mkdir ${{ needs.preparations.outputs.version }}
+          cp serverpackcreator-api/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
+          cp serverpackcreator-app/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
+          cp serverpackcreator-plugin-example/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
+          cp media/* ${{ needs.preparations.outputs.version }}/
+
+      - name: Generate checksum
+        uses: jmgilman/actions-generate-checksum@v1
+        with:
+          patterns: |
+            ${{ needs.preparations.outputs.version }}/*
+
+      - name: Collect checksum
+        run: |
+          cp checksum.txt ${{ needs.preparations.outputs.version }}/
 
       # UPLOAD ARTIFACTS
       - uses: actions/upload-artifact@v4
@@ -83,59 +105,15 @@ jobs:
             serverpackcreator-plugin-example/build
           if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
 
-      - name: Rename JAR and Plugin
-        run: |
-          mv serverpackcreator-app/build/libs/serverpackcreator-app-${{ needs.preparations.outputs.version }}.jar serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-          mv serverpackcreator-plugin-example/build/libs/serverpackcreator-plugin-example-${{ needs.preparations.outputs.version }}.jar serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
-
       # UPLOAD ARTIFACTS
       - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: jar-media-release
           path: |
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-            serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
+            ${{ needs.preparations.outputs.version }}
           if-no-files-found: warn # 'warn' or 'ignore' are also available, defaults to `warn`
 
-      - name: Collect files
-        run: |
-          mkdir ${{ needs.preparations.outputs.version }}
-          cp serverpackcreator-api/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
-          cp serverpackcreator-app/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
-          cp serverpackcreator-plugin-example/build/libs/*.jar ${{ needs.preparations.outputs.version }}/
-          cp media/* ${{ needs.preparations.outputs.version }}/
-
-      - name: Upload release to version-dir
-        uses: nogsantos/scp-deploy@master
-        with:
-          src: ./${{ needs.preparations.outputs.version }}
-          host: ${{ secrets.SPCUPLOAD_HOST }}
-          remote: "${{ secrets.SPCUPLOAD_TARGET }}"
-          user: ${{ secrets.SPCUPLOAD_USERNAME }}
-          key: ${{ secrets.SPCUPLOAD_KEY }}
-
-      - name: Cleanup latest
-        id: action-ssh
-        uses: tiyee/[email protected]
-        with:
-          host: ${{ secrets.SPCUPLOAD_HOST }}
-          username: ${{ secrets.SPCUPLOAD_USERNAME }}
-          privateKey: ${{ secrets.SPCUPLOAD_KEY }}
-          command: 'rm -f ${{ secrets.SPCUPLOAD_TARGET }}/latest/*'
-
-      - name: Upload release to latest-dir
-        uses: nogsantos/scp-deploy@master
-        with:
-          src: ./${{ needs.preparations.outputs.version }}/*
-          host: ${{ secrets.SPCUPLOAD_HOST }}
-          remote: "${{ secrets.SPCUPLOAD_TARGET }}/latest"
-          user: ${{ secrets.SPCUPLOAD_USERNAME }}
-          key: ${{ secrets.SPCUPLOAD_KEY }}
-
   release:
     name: "Release"
     if: ${{ always() }}
@@ -183,18 +161,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: jar-media-release
+          path: ${{ needs.preparations.outputs.version }}
 
-      - name: Generate checksum
-        uses: jmgilman/actions-generate-checksum@v1
-        with:
-          patterns: |
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-            serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
-
-      - name: Append Checksums Info
+      - name: Append Info
         uses: DamianReeves/[email protected]
         with:
           path: description.txt
@@ -216,12 +185,39 @@ jobs:
           prerelease: false
           fail_on_unmatched_files: false
           files: |
-            checksum.txt
-            media/*.dmg
-            media/*.sh
-            media/*.exe
-            serverpackcreator-app/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}.jar
-            serverpackcreator-plugin-example/build/libs/ServerPackCreator-${{ needs.preparations.outputs.version }}-Example-Plugin.jar
+            ${{ needs.preparations.outputs.version }}/*
+
+      - name: Get source archives
+        run: |
+          wget -O ${{ needs.preparations.outputs.version }}/source.zip https://github.com/Griefed/ServerPackCreator/archive/refs/tags/${{ needs.preparations.outputs.version }}.zip
+          wget -O ${{ needs.preparations.outputs.version }}/source.tar.gz https://github.com/Griefed/ServerPackCreator/archive/refs/tags/${{ needs.preparations.outputs.version }}.tar.gz
+
+      - name: Upload release to version-dir
+        uses: nogsantos/scp-deploy@master
+        with:
+          src: ./${{ needs.preparations.outputs.version }}
+          host: ${{ secrets.SPCUPLOAD_HOST }}
+          remote: "${{ secrets.SPCUPLOAD_TARGET }}"
+          user: ${{ secrets.SPCUPLOAD_USERNAME }}
+          key: ${{ secrets.SPCUPLOAD_KEY }}
+
+      - name: Cleanup latest
+        id: action-ssh
+        uses: tiyee/[email protected]
+        with:
+          host: ${{ secrets.SPCUPLOAD_HOST }}
+          username: ${{ secrets.SPCUPLOAD_USERNAME }}
+          privateKey: ${{ secrets.SPCUPLOAD_KEY }}
+          command: 'rm -f ${{ secrets.SPCUPLOAD_TARGET }}/latest/*'
+
+      - name: Upload release to latest-dir
+        uses: nogsantos/scp-deploy@master
+        with:
+          src: ./${{ needs.preparations.outputs.version }}/*
+          host: ${{ secrets.SPCUPLOAD_HOST }}
+          remote: "${{ secrets.SPCUPLOAD_TARGET }}/latest"
+          user: ${{ secrets.SPCUPLOAD_USERNAME }}
+          key: ${{ secrets.SPCUPLOAD_KEY }}
 
   news:
     name: "News on Discord"

serverpackcreator-api/src/main/resources/de/griefed/resources/server_files/default_java_template.sh

@@ -67,16 +67,19 @@ installJabba() {
   [ -s "$JABBA_HOME/jabba.sh" ] && source "$JABBA_HOME/jabba.sh"
 }
 
-GBLIC_VERSION=$(ldd --version | awk '/ldd/{print $NF}')
-IFS="." read -ra GBLIC_SEMANTICS <<<"${GBLIC_VERSION}"
+# if ldd is not available, we may be on MacOS
+if commandAvailable ldd ; then
+  GBLIC_VERSION=$(ldd --version | awk '/ldd/{print $NF}')
+  IFS="." read -ra GBLIC_SEMANTICS <<<"${GBLIC_VERSION}"
 
-# Older Linux systems aren't supported, sadly. This mainly affects Ubuntu 20 and Linux distributions from around that time
-# which use glibc versions older than 2.32 & 2.34.
-if [[ ${GBLIC_SEMANTICS[1]} -lt 32 ]];then
-  echo "Jabba only supports systems with glibc 2.32 & 2.34 onward. You have $GBLIC_VERSION. Automated Java installation can not proceed."
-  echo "DO NOT ATTEMPT TO UPDATE OR UPGRADE YOUR INSTALLED VERSION OF GLIBC! DOING SO MAY CORRUPT YOUR ENTIRE SYSTEM!"
-  echo "Instead, consider upgrading to a newer version of your OS. Example: In case of Ubuntu 20 LTS, consider upgrading to 22 LTS or 24 LTS."
-  exit 1
+  # Older Linux systems aren't supported, sadly. This mainly affects Ubuntu 20 and Linux distributions from around that time
+  # which use glibc versions older than 2.32 & 2.34.
+  if [[ ${GBLIC_SEMANTICS[1]} -lt 32 ]];then
+    echo "Jabba only supports systems with glibc 2.32 & 2.34 onward. You have $GBLIC_VERSION. Automated Java installation can not proceed."
+    echo "DO NOT ATTEMPT TO UPDATE OR UPGRADE YOUR INSTALLED VERSION OF GLIBC! DOING SO MAY CORRUPT YOUR ENTIRE SYSTEM!"
+    echo "Instead, consider upgrading to a newer version of your OS. Example: In case of Ubuntu 20 LTS, consider upgrading to 22 LTS or 24 LTS."
+    exit 1
+  fi
 fi
 
 if [[ ! -s "variables.txt" ]]; then

spc.install4j

@@ -443,6 +443,21 @@ if they so desire. By default $USERHOME/ServerPackCreator will be used for them.
                         </property>
                       </object>
                     </add>
+                    <add>
+                      <object class="com.install4j.runtime.beans.screens.components.ProgramGroupFileConfig">
+                        <property name="iconFile">
+                          <object class="com.install4j.api.beans.ExternalFile">
+                            <string>./img/load.ico</string>
+                          </object>
+                        </property>
+                        <property name="name" type="string">Check For Update</property>
+                        <property name="target">
+                          <object class="java.io.File">
+                            <string>updater</string>
+                          </object>
+                        </property>
+                      </object>
+                    </add>
                   </property>
                   <property name="programGroupName" type="string">ServerPackCreator</property>
                   <property name="uninstallerMenuName" type="string">${i18n:UninstallerMenuEntry(${compiler:sys.fullName})}</property>
@@ -487,20 +502,6 @@ if they so desire. By default $USERHOME/ServerPackCreator will be used for them.
                 </serializedBean>
                 <condition>context.getBooleanVariable("createDesktopLinkAction")</condition>
               </action>
-              <action name="Set home-directory property" id="331" beanClass="com.install4j.runtime.beans.actions.properties.WritePropertiesFileAction" enabled="false" actionElevationType="elevated" rollbackBarrierExitCode="0" errorMessage="Couldn't writer properties!">
-                <serializedBean>
-                  <property name="encoding" type="enum" class="com.install4j.runtime.beans.actions.properties.PropertiesFileEncoding" value="JAVA_PROPERTIES" />
-                  <property name="file">
-                    <object class="java.io.File">
-                      <string>${installer:sys.installationDir}/serverpackcreator.properties</string>
-                    </object>
-                  </property>
-                  <property name="propertiesSortMode" type="enum" class="com.install4j.runtime.beans.actions.properties.PropertiesSortMode" value="KEYS_ALPHABETICALLY" />
-                  <property name="sourcePropertyDefinitions" type="string">de.griefed.serverpackcreator.home=${installer:homeDirectory}</property>
-                  <property name="updateExistingComments" type="boolean" value="true" />
-                  <property name="updateExistingKeys" type="boolean" value="true" />
-                </serializedBean>
-              </action>
               <action id="377" beanClass="com.install4j.runtime.beans.actions.registry.SetPreferenceKeyAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
                   <property name="key" type="string">de.griefed.serverpackcreator.home</property>