From 49deee5a8217d7dd4aeb1d36f072bc772408dc55 Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Thu, 18 Aug 2022 14:54:19 +0200 Subject: [PATCH] Format code --- dist/index.js | 5 +++-- src/installer.ts | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dist/index.js b/dist/index.js index be51046..08aaba4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -224,7 +224,8 @@ class DotnetVersionResolver { this.resolvedArgument.qualityFlag = true; if (semver_1.default.validRange(this.inputVersion)) { let coercedVersion = semver_1.default.coerce(this.inputVersion); - this.resolvedArgument.value = (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.major) + "." + (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.minor); + this.resolvedArgument.value = + (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.major) + '.' + (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.minor); } else { this.resolvedArgument.value = this.inputVersion; @@ -362,7 +363,7 @@ class DotnetCoreInstaller { } } exports.DotnetCoreInstaller = DotnetCoreInstaller; -DotnetCoreInstaller.installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', "dotnet"); +DotnetCoreInstaller.installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', 'dotnet'); DotnetCoreInstaller.installationDirectoryLinux = '/usr/share/dotnet'; function logWarning(message) { const warningPrefix = '[warning]'; diff --git a/src/installer.ts b/src/installer.ts index 83b2cf7..0e6c1d7 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -56,7 +56,8 @@ export class DotnetVersionResolver { this.resolvedArgument.qualityFlag = true; if (semver.validRange(this.inputVersion)) { let coercedVersion = semver.coerce(this.inputVersion); - this.resolvedArgument.value = coercedVersion?.major + "." + coercedVersion?.minor; + this.resolvedArgument.value = + coercedVersion?.major + '.' + coercedVersion?.minor; } else { this.resolvedArgument.value = this.inputVersion; } @@ -83,7 +84,10 @@ export class DotnetVersionResolver { export class DotnetCoreInstaller { private version: string; private quality: string; - static readonly installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', "dotnet"); + static readonly installationDirectoryWindows = path.join( + process.env['PROGRAMFILES'] + '', + 'dotnet' + ); static readonly installationDirectoryLinux = '/usr/share/dotnet'; constructor(version: string, quality: string) { @@ -94,7 +98,6 @@ export class DotnetCoreInstaller { public async installDotnet() { let output = ''; let resultCode = 0; - const versionResolver = new DotnetVersionResolver(this.version); const versionObject = versionResolver.createVersionObject(); @@ -179,7 +182,10 @@ export class DotnetCoreInstaller { } if (IS_LINUX) { - scriptArguments.push('--install-dir', DotnetCoreInstaller.installationDirectoryLinux); + scriptArguments.push( + '--install-dir', + DotnetCoreInstaller.installationDirectoryLinux + ); } // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used @@ -209,13 +215,12 @@ export class DotnetCoreInstaller { 'DOTNET_ROOT', DotnetCoreInstaller.installationDirectoryWindows ); - } - else if (IS_LINUX) { + } else if (IS_LINUX) { core.addPath(DotnetCoreInstaller.installationDirectoryLinux); core.exportVariable( 'DOTNET_ROOT', DotnetCoreInstaller.installationDirectoryLinux - ); + ); } else { // This is the default set in install-dotnet.sh core.addPath(path.join(process.env['HOME'] + '', '.dotnet'));