From d682e3fc65d7d5031af4304e974d1845254dc0f5 Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Wed, 3 Apr 2024 00:13:49 +0200
Subject: [PATCH] setup java 17 and java 22

---
 packages/core/src/prerequisites.js | 50 +++++++++++++++++++++++++-----
 packages/core/src/vars.js          |  3 +-
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/prerequisites.js b/packages/core/src/prerequisites.js
index 9fb7df7..9b7f442 100644
--- a/packages/core/src/prerequisites.js
+++ b/packages/core/src/prerequisites.js
@@ -34,15 +34,15 @@ export default [
         deleteBeforeExtract: true,
     },
     {
-        id: "java_jre_bin",
-        finalBin: Vars.java_jre_bin,
+        id: "java22_jre_bin",
+        finalBin: Vars.java22_jre_bin,
         url: async (os, arch) => {
             const { data } = await axios({
                 method: "GET",
                 url: "https://api.azul.com/metadata/v1/zulu/packages",
                 params: {
                     arch: arch,
-                    java_version: "JAVA_22",
+                    java_version: "22",
                     os: os,
                     archive_type: "zip",
                     javafx_bundled: "false",
@@ -53,18 +53,52 @@ export default [
 
             return data[0].download_url
         },
-        destination: path.resolve(Vars.binaries_path, "java-jre.zip"),
-        extract: path.resolve(Vars.binaries_path, "java_jre_bin"),
+        destination: path.resolve(Vars.binaries_path, "java22-jre.zip"),
+        extract: path.resolve(Vars.binaries_path, "java22_jre_bin"),
         extractTargetFromName: true,
         moveDirs: [
             {
                 requireOs: ["macos"],
-                from: path.resolve(Vars.binaries_path, "java_jre_bin", "zulu-22.jre", "Contents"),
-                to: path.resolve(Vars.binaries_path, "java_jre_bin", "Contents"),
+                from: path.resolve(Vars.binaries_path, "java22_jre_bin", "zulu-22.jre", "Contents"),
+                to: path.resolve(Vars.binaries_path, "java22_jre_bin", "Contents"),
                 deleteParentBefore: true
             }
         ],
-        rewriteExecutionPermission: path.resolve(Vars.binaries_path, "java_jre_bin"),
+        rewriteExecutionPermission: path.resolve(Vars.binaries_path, "java22_jre_bin"),
+        deleteBeforeExtract: true,
+    },
+    {
+        id: "java17_jre_bin",
+        finalBin: Vars.java17_jre_bin,
+        url: async (os, arch) => {
+            const { data } = await axios({
+                method: "GET",
+                url: "https://api.azul.com/metadata/v1/zulu/packages",
+                params: {
+                    arch: arch,
+                    java_version: "17",
+                    os: os,
+                    archive_type: "zip",
+                    javafx_bundled: "false",
+                    java_package_type: "jre",
+                    page_size: "1",
+                }
+            })
+
+            return data[0].download_url
+        },
+        destination: path.resolve(Vars.binaries_path, "java17-jre.zip"),
+        extract: path.resolve(Vars.binaries_path, "java17_jre_bin"),
+        extractTargetFromName: true,
+        moveDirs: [
+            {
+                requireOs: ["macos"],
+                from: path.resolve(Vars.binaries_path, "java17_jre_bin", "zulu-17.jre", "Contents"),
+                to: path.resolve(Vars.binaries_path, "java17_jre_bin", "Contents"),
+                deleteParentBefore: true
+            }
+        ],
+        rewriteExecutionPermission: path.resolve(Vars.binaries_path, "java17_jre_bin"),
         deleteBeforeExtract: true,
     },
 ]
\ No newline at end of file
diff --git a/packages/core/src/vars.js b/packages/core/src/vars.js
index 3fc23fc..40dd654 100644
--- a/packages/core/src/vars.js
+++ b/packages/core/src/vars.js
@@ -20,7 +20,8 @@ const binaries = {
     sevenzip_bin: upath.normalizeSafe(path.resolve(binaries_path, "7z-bin", isWin ? "7za.exe" : "7za")),
     git_bin: upath.normalizeSafe(path.resolve(binaries_path, "git-bin", "bin", isWin ? "git.exe" : "git")),
     rclone_bin: upath.normalizeSafe(path.resolve(binaries_path, "rclone-bin", isWin ? "rclone.exe" : "rclone")),
-    java_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
+    java22_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java22_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
+    java17_jre_bin: upath.normalizeSafe(path.resolve(binaries_path, "java17_jre_bin", (isMac ? "Contents/Home/bin/java" : (isWin ? "bin/java.exe" : "bin/java")))),
 }
 
 export default {