lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-09-24 01:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wt spaces in path

Browse Source
This commit is contained in:
crschnick
2025-08-25 09:38:49 +00:00
parent daad2ff8b6
commit 46d49a4aed
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
+32 -14
View File
@@ -47,9 +47,11 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
cmd.add("--title").addQuoted(fixedName);
cmd.add("--profile").addQuoted("{021eff0f-b38a-45f9-895d-41467e9d510f}");
var spaces = configuration.getScriptFile().toString().contains(" ");
cmd.add(configuration
.getScriptDialect()
.getOpenScriptCommand(configuration.getScriptFile().getFileName()));
.getOpenScriptCommand(spaces ? configuration.getScriptFile().getFileName() : configuration.getScriptFile().toString()));
return cmd;
}
@@ -131,11 +133,16 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
try (var sc = LocalShell.getShell().start()) {
var inPath = sc.view().findProgram("wt");
var exec = inPath.orElse(FilePath.of(getPath()));
var wd = sc.view().pwd();
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
.withWorkingDirectory(configuration.getScriptFile().getParent())
.execute();
sc.view().cd(wd);
var spaces = configuration.getScriptFile().toString().contains(" ");
if (spaces) {
var wd = sc.view().pwd();
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).withWorkingDirectory(
configuration.getScriptFile().getParent()).execute();
sc.view().cd(wd);
} else {
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).execute();
}
}
}
@@ -181,10 +188,16 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
try (var sc = LocalShell.getShell().start()) {
var exec = getPath();
var wd = sc.view().pwd();
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
.withWorkingDirectory(configuration.getScriptFile().getParent())
.execute();
sc.view().cd(wd);
var spaces = configuration.getScriptFile().toString().contains(" ");
if (spaces) {
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
.withWorkingDirectory(configuration.getScriptFile().getParent())
.execute();
sc.view().cd(wd);
} else {
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).execute();
}
}
}
@@ -231,10 +244,15 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
try (var sc = LocalShell.getShell().start()) {
var exec = getPath();
var wd = sc.view().pwd();
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
.withWorkingDirectory(configuration.getScriptFile().getParent())
.execute();
sc.view().cd(wd);
var spaces = configuration.getScriptFile().toString().contains(" ");
if (spaces) {
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).withWorkingDirectory(
configuration.getScriptFile().getParent()).execute();
sc.view().cd(wd);
} else {
sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).execute();
}
}
}