From ae77984eef13e4fc9cd5c09b2c89857db0a2a7c1 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 14 Mar 2024 14:46:42 +0530 Subject: [PATCH] patch to extract filename from other directories --- dist/cleanup/index.js | 4 ++-- dist/setup/index.js | 4 ++-- src/util.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 62db4e5..c449731 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -88360,11 +88360,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) { return path.basename(versionFile); } const versionFileName = getFileName(versionFile); - if (versionFile == '.tool-versions') { + if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } - else if (versionFile == '.java-version') { + else if (versionFileName == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { diff --git a/dist/setup/index.js b/dist/setup/index.js index 0b90b84..b084850 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125734,11 +125734,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) { return path.basename(versionFile); } const versionFileName = getFileName(versionFile); - if (versionFile == '.tool-versions') { + if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } - else if (versionFile == '.java-version') { + else if (versionFileName == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { diff --git a/src/util.ts b/src/util.ts index 0497cec..8614617 100644 --- a/src/util.ts +++ b/src/util.ts @@ -126,10 +126,10 @@ export function getVersionFromFileContent( } const versionFileName = getFileName(versionFile); - if (versionFile == '.tool-versions') { + if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; - } else if (versionFile == '.java-version') { + } else if (versionFileName == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { throw new Error('Invalid version file');