SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No /bin/bash -c when no os operator passed

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-11-18 15:21:36 +01:00
parent 2e6c3fc7cf
commit b8610c5aef
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectCommandExecutor.java
View File

@@ -244,6 +244,8 @@ public class ProjectCommandExecutor implements ReleaserPropertiesAware {
class ProcessExecutor implements ReleaserPropertiesAware {
private static String[] OS_OPERATORS = { "|", "<", ">", "||", "&&" };
private static final Logger log = LoggerFactory.getLogger(ProcessExecutor.class);
private String workingDir;
@@ -289,12 +291,13 @@ class ProcessExecutor implements ReleaserPropertiesAware {
}
ProcessBuilder builder(String[] commands, String workingDir) {
// TODO: Improve this to not pass arrays in the first place
String[] commandsToRun = commands;
String lastArg = String.join(" ", commands);
String[] commandsWithBash = commandToExecute(lastArg);
log.info(
"Will run the command [{}]", Arrays.toString(commandsWithBash));
return new ProcessBuilder(commandsWithBash).directory(new File(workingDir))
if (Arrays.stream(OS_OPERATORS).anyMatch(lastArg::contains)) {
commandsToRun = commandToExecute(lastArg);
}
log.info("Will run the command [{}]", Arrays.toString(commandsToRun));
return new ProcessBuilder(commandsToRun).directory(new File(workingDir))
.inheritIO();
}