From a19f51dc3852115b7dab0aa062b98c58adf946ff Mon Sep 17 00:00:00 2001
From: peterz <peterz@disroot.org>
Date: Mon, 18 Mar 2024 16:35:51 +0300
Subject: [PATCH] Cleanups

---
 dist/main/index.js | 8 ++++----
 src/liberica.ts    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/main/index.js b/dist/main/index.js
index ed09bc2..9de0215 100644
--- a/dist/main/index.js
+++ b/dist/main/index.js
@@ -94300,14 +94300,14 @@ function findLibericaURL(javaVersion, javaPackage) {
                 return asset.browser_download_url;
             }
         }
-        throw new Error(`Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}`);
+        throw new Error(`Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}. ${c.ERROR_REQUEST}`);
     });
 }
 exports.findLibericaURL = findLibericaURL;
 function determineToolName(javaVersion, javaPackage) {
     const variant = determineVariantPart(javaPackage);
     const platform = determinePlatformPart();
-    return `${LIBERICA_VM_PREFIX}${variant}openjdk${javaVersion}-${platform}`;
+    return `${LIBERICA_VM_PREFIX}${variant}${platform}`;
 }
 function determineVariantPart(javaPackage) {
     return javaPackage !== null && javaPackage.includes('+fx') ? 'full-' : '';
@@ -94323,7 +94323,7 @@ function determinePlatformPart() {
 function isMuslBasedLinux() {
     if (c.IS_LINUX) {
         const output = (0, child_process_1.spawnSync)('ldd', ['--version']).stderr.toString('utf8');
-        if (output.indexOf('musl') > -1) {
+        if (output.includes('musl')) {
             return true;
         }
     }
@@ -94433,7 +94433,7 @@ function run() {
                         graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalVMVersion, javaVersion);
                         break;
                     case c.DISTRIBUTION_LIBERICA:
-                        graalVMHome = yield (0, liberica_1.setUpLiberica)(javaVersion, graalVMVersion);
+                        graalVMHome = yield (0, liberica_1.setUpLiberica)(javaVersion, javaPackage);
                         break;
                     case '':
                         if (javaVersion === c.VERSION_DEV) {
diff --git a/src/liberica.ts b/src/liberica.ts
index 9e77c03..7e65cfd 100644
--- a/src/liberica.ts
+++ b/src/liberica.ts
@@ -82,14 +82,14 @@ export async function findLibericaURL(
     }
   }
   throw new Error(
-    `Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}`
+    `Unable to find asset for java-version: ${javaVersion}, java-package: ${javaPackage}, platform: ${platform}. ${c.ERROR_REQUEST}`
   )
 }
 
 function determineToolName(javaVersion: string, javaPackage: string) {
   const variant = determineVariantPart(javaPackage)
   const platform = determinePlatformPart()
-  return `${LIBERICA_VM_PREFIX}${variant}openjdk${javaVersion}-${platform}`
+  return `${LIBERICA_VM_PREFIX}${variant}${platform}`
 }
 
 function determineVariantPart(javaPackage: string) {
@@ -107,7 +107,7 @@ function determinePlatformPart() {
 function isMuslBasedLinux() {
   if (c.IS_LINUX) {
     const output = spawnSync('ldd', ['--version']).stderr.toString('utf8')
-    if (output.indexOf('musl') > -1) {
+    if (output.includes('musl')) {
       return true
     }
   }