archive-gh-me/jsweet
1
0
Fork 0
mirror of https://github.com/cincheo/jsweet.git synced 2025-12-15 15:29:22 +00:00
Code Issues Projects Releases Wiki Activity

fix NPE in global npm package lookup

Browse Source
This commit is contained in:
lgrignon 2019-09-09 00:50:54 +02:00
parent a7bc751ec6
commit 8d48e0a410
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transpiler/src/main/java/org/jsweet/transpiler/util/ProcessUtil.java
View File

@ -125,11 +125,8 @@ public class ProcessUtil {
logger.info("cannot find " + command + " - searching in node_modules files"); logger.info("cannot find " + command + " - searching in node_modules files");
unixPath = lookupGlobalNpmPackageExecutablePath(NPM_DIR, command); unixPath = lookupGlobalNpmPackageExecutablePath(NPM_DIR, command);
if (unixPath != null) {
return unixPath; return unixPath;
}
throw new RuntimeException("cannot find executable " + command);
} }
} }
@ -184,14 +181,16 @@ public class ProcessUtil {
* Tells if this node command is globally installed. * Tells if this node command is globally installed.
*/ */
public static boolean isExecutableInstalledGloballyWithNpm(String command) { public static boolean isExecutableInstalledGloballyWithNpm(String command) {
return new File(getGlobalNpmPackageExecutablePath(command)).exists(); String executablePath = getGlobalNpmPackageExecutablePath(command);
return executablePath != null && new File(executablePath).exists();
} }
/** /**
* Tells if this node command is locally or globally installed * Tells if this node command is locally or globally installed
*/ */
public static boolean isExecutableInstalledLocallyWithNpm(String command, File projectDirectory) { public static boolean isExecutableInstalledLocallyWithNpm(String command, File projectDirectory) {
return new File(getLocalNpmPackageExecutablePath(command, projectDirectory)).exists(); String executablePath = getLocalNpmPackageExecutablePath(command, projectDirectory);
return executablePath != null && new File(executablePath).exists();
} }
/** /**