CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-30 00:56:56 +13:00
Code Issues Projects Releases Packages Wiki Activity

Fix environment variable handling in command builder

Browse source
This commit is contained in:
crschnick 2023-12-15 02:57:54 +00:00
parent 3afbb2ed0a
commit 215b78b75e
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/src/main/java/io/xpipe/core/process/CommandBuilder.java
View file

@ -1,11 +1,9 @@
package io.xpipe.core.process;
import lombok.Getter;
import lombok.SneakyThrows;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.SequencedCollection;
import java.util.*;
public class CommandBuilder {
@ -16,6 +14,18 @@ public class CommandBuilder {
private CommandBuilder() {}
private final List<Element> elements = new ArrayList<>();
@Getter
private final Map<String, String> environmentVariables = new LinkedHashMap<>();
public CommandBuilder envrironment(String k, String v) {
environmentVariables.put(k, v);
return this;
}
public CommandBuilder envrironment(Map<String, String> map) {
environmentVariables.putAll(map);
return this;
}
public interface Element {
@ -155,7 +165,7 @@ public class CommandBuilder {
return this;
}
public String build(ShellControl sc) throws Exception {
public String buildBase(ShellControl sc) throws Exception {
List<String> list = new ArrayList<>();
for (Element element : elements) {
String evaluate = element.evaluate(sc);
@ -168,6 +178,11 @@ public class CommandBuilder {
return String.join(" ", list);
}
public String build(ShellControl sc) throws Exception {
var s = buildBase(sc);
return sc.getShellDialect().addInlineVariablesToCommand(environmentVariables, s);
}
public CommandControl buildCommand(ShellControl sc) {
return sc.command(this);
}

2
core/src/main/java/io/xpipe/core/process/ShellDialect.java
View file

@ -86,7 +86,7 @@ public interface ShellDialect {
String getScriptFileEnding();
void addInlineVariablesToCommand(Map<String, String> variables, CommandBuilder command);
String addInlineVariablesToCommand(Map<String, String> variables, String command);
Stream<FileSystem.FileEntry> listFiles(FileSystem fs, ShellControl control, String dir) throws Exception;