CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-02 21:11:03 +12:00
Code Issues Packages Projects Releases Wiki Activity

Improve substitution of variables in custom commands

Browse source
This commit is contained in:
crschnick 2023-07-09 12:53:09 +00:00
parent 068e79bbe6
commit 35ca2ae716
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/io/xpipe/app/prefs/ExternalEditorType.java
View file

@ -117,8 +117,7 @@ public interface ExternalEditorType extends PrefsChoiceValue {
}
var format = customCommand.contains("$file") ? customCommand : customCommand + " $file";
var fileString = file.toString().contains(" ") ? "\"" + file + "\"" : file.toString();
ApplicationHelper.executeLocalApplication(sc -> format.replace("$file", fileString), true);
ApplicationHelper.executeLocalApplication(sc -> ApplicationHelper.replaceFileArgument(format, "file", file.toString()), true);
}
@Override

2
app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
View file

@ -349,7 +349,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
var format = custom.contains("$cmd") ? custom : custom + " $cmd";
try (var pc = LocalStore.getShell()) {
var toExecute = format.replace("$cmd", "\"" + file + "\"");
var toExecute = ApplicationHelper.replaceFileArgument(format, "cmd", file);
if (pc.getOsType().equals(OsType.WINDOWS)) {
toExecute = "start \"" + name + "\" " + toExecute;
} else {

7
app/src/main/java/io/xpipe/app/util/ApplicationHelper.java
View file

@ -9,6 +9,13 @@ import java.util.function.Function;
public class ApplicationHelper {
public static String replaceFileArgument(String format, String variable, String file) {
var fileString = file.contains(" ") ? "\"" + file + "\"" : file;
// Check if the variable is already quoted
var replaced = format.replace("\"$" + variable + "\"", fileString).replace("$" + variable, fileString);
return replaced;
}
public static void executeLocalApplication(Function<ShellControl, String> s, boolean detach) throws Exception {
try (var sc = LocalStore.getShell().start()) {
var cmd = detach ? ScriptHelper.createDetachCommand(sc, s.apply(sc)) : s.apply(sc);