add suggested changes

Signed-off-by: Aryan Rajoria <[email protected]>

envcontext.js

@@ -513,7 +513,7 @@ export function installSdkmanTool(toolType, toolName) {
  *
  * @returns {String} path of nvm if present, otherwise false
  */
-export function ifNvmToolAvailable(toolName) {
+export function getNvmToolDirectory(toolName) {
   const resultWhichNode = spawnSync(
     process.env.SHELL || "bash",
     ["-i", "-c", `"nvm which ${toolName}"`],
@@ -544,8 +544,8 @@ export function ifNvmToolAvailable(toolName) {
  *
  * @returns {String} path of the tool if not found installs and then returns paths. false if encounters an error.
  */
-export function getNvmToolPath(toolVersion) {
-  const nvmNodePath = ifNvmToolAvailable(toolVersion);
+export function getOrInstallNvmTool(toolVersion) {
+  const nvmNodePath = getNvmToolDirectory(toolVersion);
   if (!nvmNodePath) {
     // nvm couldn't directly use toolName so maybe needs to be installed
     const resultInstall = spawnSync(
@@ -571,7 +571,7 @@ export function getNvmToolPath(toolVersion) {
       // output has already been printed out
       return false;
     }
-    const nvmNodePath = ifNvmToolAvailable(toolVersion);
+    const nvmNodePath = getNvmToolDirectory(toolVersion);
     if (nvmNodePath) {
       return nvmNodePath;
     }

pregen.js

@@ -4,8 +4,8 @@ import { arch, platform, tmpdir } from "node:os";
 import { delimiter, join } from "node:path";
 import {
   SDKMAN_TOOL_ALIASES,
-  getNvmToolPath,
-  ifNvmToolAvailable,
+  getNvmToolDirectory,
+  getOrInstallNvmTool,
   installSdkmanTool,
   isNvmAvailable,
   isSdkmanAvailable,
@@ -156,7 +156,7 @@ export function prepareNodeEnv(filePath, options) {
         }
       }
       // set path instead of nvm use
-      const nvmNodePath = getNvmToolPath(nodeVersion);
+      const nvmNodePath = getOrInstallNvmTool(nodeVersion);
       doNpmInstall(filePath, nvmNodePath);
     }
   }
@@ -188,11 +188,8 @@ export function tryLoadNvmAndInstallTool(nodeVersion) {
     encoding: "utf-8",
     shell: process.env.SHELL || true,
   });
-  if (spawnedShell.status === 0) {
-    return true;
-  }
 
-  return false;
+  return result.status === 0;
 }
 
 /**

types/envcontext.d.ts

@@ -174,15 +174,15 @@ export function installSdkmanTool(toolType: string, toolName: string): boolean;
  *
  * @returns {String} path of nvm if present, otherwise false
  */
-export function ifNvmToolAvailable(toolName: string): string;
+export function getNvmToolDirectory(toolName: string): string;
 /**
  * Method to return nvm tool path
  *
  * @param {String} toolVersion Tool name with version. Eg: 22.0.2-tem
  *
  * @returns {String} path of the tool if not found installs and then returns paths. false if encounters an error.
  */
-export function getNvmToolPath(toolVersion: string): string;
+export function getOrInstallNvmTool(toolVersion: string): string;
 export const GIT_COMMAND: any;
 export namespace SDKMAN_TOOL_ALIASES {
     let java8: string;