From 221194fabc5e260a41c19ce2ed044faa52d4f453 Mon Sep 17 00:00:00 2001
From: Daniil Razorenov <daniltmb@gmail.com>
Date: Wed, 10 Nov 2021 11:47:08 +0300
Subject: [PATCH] Fix extracting Java from archive

---
 dist/setup/index.js                     | 3 ++-
 src/distributions/liberica/installer.ts | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 07fa7f29..734c5af5 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -38607,7 +38607,8 @@ class LibericaDistributions extends base_installer_1.JavaBase {
             core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
             const javaArchivePath = yield tc.downloadTool(javaRelease.url);
             core.info(`Extracting Java archive...`);
-            const extractedJavaPath = yield util_1.extractJdkFile(javaArchivePath);
+            const extension = util_1.getDownloadArchiveExtension();
+            const extractedJavaPath = yield util_1.extractJdkFile(javaArchivePath, extension);
             const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
             const archivePath = path_1.default.join(extractedJavaPath, archiveName);
             const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, this.getToolcacheVersionName(javaRelease.version), this.architecture);
diff --git a/src/distributions/liberica/installer.ts b/src/distributions/liberica/installer.ts
index c54e0974..ab7bfc63 100644
--- a/src/distributions/liberica/installer.ts
+++ b/src/distributions/liberica/installer.ts
@@ -1,7 +1,7 @@
 import { JavaBase } from '../base-installer';
 import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
 import semver from 'semver';
-import { extractJdkFile, isVersionSatisfies } from '../../util';
+import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
 import * as core from '@actions/core';
 import { ArchitectureOptions, LibericaVersion, OsVersions } from './models';
 import * as tc from '@actions/tool-cache';
@@ -24,7 +24,8 @@ export class LibericaDistributions extends JavaBase {
     const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
-    const extractedJavaPath = await extractJdkFile(javaArchivePath);
+    const extension = getDownloadArchiveExtension();
+    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];
     const archivePath = path.join(extractedJavaPath, archiveName);