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

Merge branch 'master' of https://github.com/cincheo/jsweet.git

Browse Source
This commit is contained in:
Renaud Pawlak 2017-11-25 11:23:45 +01:00
commit 56bca69a48
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transpiler/pom.xml
View File

@ -154,7 +154,7 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.3.2</version> <version>3.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>

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

@ -180,15 +180,16 @@ public class ProcessUtil {
} else { } else {
cmd = new String[] { "cmd", "/c", command }; cmd = new String[] { "cmd", "/c", command };
} }
cmd = ArrayUtils.addAll(cmd, args);
} else { } else {
if (nodeCommands.contains(command)) { if (nodeCommands.contains(command)) {
cmd = new String[] { getNpmPath(command) }; cmd = new String[] { getNpmPath(command) };
cmd = ArrayUtils.addAll(cmd, args);
} else { } else {
cmd = new String[] { command }; String cmdAndArgs = StringUtils.join(ArrayUtils.insert(0, args, command), " ");
cmd = new String[] { "/bin/sh", "-c", cmdAndArgs };
} }
} }
cmd = ArrayUtils.addAll(cmd, args);
logger.debug("run command: " + StringUtils.join(cmd, " ")); logger.debug("run command: " + StringUtils.join(cmd, " "));
Process[] process = { null }; Process[] process = { null };
try { try {