From cfdcd6827be700273d54046be749f978d77cef25 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 8 Mar 2021 18:21:32 +0300 Subject: [PATCH] minor improvements --- action.yml | 2 +- dist/cleanup/index.js | 4 ++-- dist/setup/index.js | 10 +++++----- src/constants.ts | 2 +- src/distributions/adoptium/installer.ts | 4 ++-- src/distributions/local/installer.ts | 7 ++++--- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/action.yml b/action.yml index 4a164e9f..1d0863a2 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: description: 'Java distribution. See the list of supported distributions in README file' required: false java-package: - description: 'The package type (jdk, jre)' + description: 'The package type (jdk, jre, jdk+fx, jre+fx)' required: false default: 'jdk' architecture: diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 88a5b652..dbcef343 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -4929,8 +4929,8 @@ function isUnixExecutable(stats) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.macOSJavaContentDir = void 0; -exports.macOSJavaContentDir = 'Contents/Home'; +exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0; +exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home'; exports.INPUT_JAVA_VERSION = 'java-version'; exports.INPUT_ARCHITECTURE = 'architecture'; exports.INPUT_JAVA_PACKAGE = 'java-package'; diff --git a/dist/setup/index.js b/dist/setup/index.js index 5c99f736..cee52dd1 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -9368,8 +9368,8 @@ class LocalDistribution extends base_installer_1.JavaBase { const javaVersion = this.version.raw; let javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, this.getToolcacheVersionName(javaVersion), this.architecture); if (process.platform === 'darwin' && - fs_1.default.existsSync(path_1.default.join(javaPath, constants_1.macOSJavaContentDir))) { - javaPath = path_1.default.join(javaPath, constants_1.macOSJavaContentDir); + fs_1.default.existsSync(path_1.default.join(javaPath, constants_1.MACOS_JAVA_CONTENT_POSTFIX))) { + javaPath = path_1.default.join(javaPath, constants_1.MACOS_JAVA_CONTENT_POSTFIX); } foundJava = { version: javaVersion, @@ -11291,8 +11291,8 @@ exports.HTMLCollectionImpl = HTMLCollectionImpl; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.macOSJavaContentDir = void 0; -exports.macOSJavaContentDir = 'Contents/Home'; +exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0; +exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home'; exports.INPUT_JAVA_VERSION = 'java-version'; exports.INPUT_ARCHITECTURE = 'architecture'; exports.INPUT_JAVA_PACKAGE = 'java-package'; @@ -13793,7 +13793,7 @@ class AdoptiumDistribution extends base_installer_1.JavaBase { const version = this.getToolcacheVersionName(javaRelease.version); javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture); if (process.platform === 'darwin') { - javaPath = path_1.default.join(javaPath, constants_1.macOSJavaContentDir); + javaPath = path_1.default.join(javaPath, constants_1.MACOS_JAVA_CONTENT_POSTFIX); } return { version: javaRelease.version, path: javaPath }; }); diff --git a/src/constants.ts b/src/constants.ts index 3a72d6f2..41fd1d49 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,4 +1,4 @@ -export const macOSJavaContentDir = 'Contents/Home'; +export const MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home'; export const INPUT_JAVA_VERSION = 'java-version'; export const INPUT_ARCHITECTURE = 'architecture'; export const INPUT_JAVA_PACKAGE = 'java-package'; diff --git a/src/distributions/adoptium/installer.ts b/src/distributions/adoptium/installer.ts index f569eaf0..45232ad0 100644 --- a/src/distributions/adoptium/installer.ts +++ b/src/distributions/adoptium/installer.ts @@ -8,7 +8,7 @@ import semver from 'semver'; import { JavaBase } from '../base-installer'; import { IAdoptiumAvailableVersions } from './models'; import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models'; -import { macOSJavaContentDir } from '../../constants'; +import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants'; import { extractJdkFile, getDownloadArchiveExtension } from '../../util'; export class AdoptiumDistribution extends JavaBase { @@ -68,7 +68,7 @@ export class AdoptiumDistribution extends JavaBase { javaPath = await tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture); if (process.platform === 'darwin') { - javaPath = path.join(javaPath, macOSJavaContentDir); + javaPath = path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX); } return { version: javaRelease.version, path: javaPath }; diff --git a/src/distributions/local/installer.ts b/src/distributions/local/installer.ts index 63a6b54d..8ccd080f 100644 --- a/src/distributions/local/installer.ts +++ b/src/distributions/local/installer.ts @@ -8,7 +8,7 @@ import semver from 'semver'; import { JavaBase } from '../base-installer'; import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models'; import { extractJdkFile } from '../../util'; -import { macOSJavaContentDir } from '../../constants'; +import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants'; export class LocalDistribution extends JavaBase { constructor(installerOptions: JavaInstallerOptions, private jdkFile?: string) { @@ -48,11 +48,12 @@ export class LocalDistribution extends JavaBase { this.architecture ); + // for different Java distributions, postfix can exist or not so need to check both cases if ( process.platform === 'darwin' && - fs.existsSync(path.join(javaPath, macOSJavaContentDir)) + fs.existsSync(path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX)) ) { - javaPath = path.join(javaPath, macOSJavaContentDir); + javaPath = path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX); } foundJava = {