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

Show name of system in path check

Browse source
This commit is contained in:
crschnick 2023-06-08 16:23:46 +00:00
parent ed60342f65
commit 5dd9a3c984
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
@Override @Override
public void launch(String name, String file, boolean elevated) throws Exception { public void launch(String name, String file, boolean elevated) throws Exception {
try (ShellControl pc = LocalStore.getShell()) { try (ShellControl pc = LocalStore.getShell()) {
ApplicationHelper.checkSupport(pc, executable, getDisplayName()); ApplicationHelper.checkSupport(pc, executable, getDisplayName(), null);
var toExecute = executable + " " + toCommand(name, file); var toExecute = executable + " " + toCommand(name, file);
// In order to fix this bug which also affects us: // In order to fix this bug which also affects us:
@ -367,7 +367,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
try (ShellControl pc = LocalStore.getShell() try (ShellControl pc = LocalStore.getShell()
.subShell(ShellDialects.POWERSHELL) .subShell(ShellDialects.POWERSHELL)
.start()) { .start()) {
ApplicationHelper.checkSupport(pc, executable, displayName); ApplicationHelper.checkSupport(pc, executable, displayName, null);
var toExecute = "Start-Process \"" + executable + "\" -Verb RunAs -ArgumentList \"" var toExecute = "Start-Process \"" + executable + "\" -Verb RunAs -ArgumentList \""
+ toCommand(name, file).replaceAll("\"", "`\"") + "\""; + toCommand(name, file).replaceAll("\"", "`\"") + "\"";
pc.executeSimpleCommand(toExecute); pc.executeSimpleCommand(toExecute);
@ -377,7 +377,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
} }
try (ShellControl pc = LocalStore.getShell()) { try (ShellControl pc = LocalStore.getShell()) {
ApplicationHelper.checkSupport(pc, executable, displayName); ApplicationHelper.checkSupport(pc, executable, displayName, null);
var toExecute = executable + " " + toCommand(name, file); var toExecute = executable + " " + toCommand(name, file);
if (pc.getOsType().equals(OsType.WINDOWS)) { if (pc.getOsType().equals(OsType.WINDOWS)) {

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

@ -27,10 +27,10 @@ public class ApplicationHelper {
processControl.getShellDialect().getWhichCommand(executable)); processControl.getShellDialect().getWhichCommand(executable));
} }
public static void checkSupport(ShellControl processControl, String executable, String displayName) public static void checkSupport(ShellControl processControl, String executable, String displayName, String connectionName)
throws Exception { throws Exception {
if (!isInPath(processControl, executable)) { if (!isInPath(processControl, executable)) {
throw new IOException(displayName + " executable " + executable + " not found in PATH"); throw new IOException(displayName + " executable " + executable + " not found in PATH" + (connectionName != null ? " on system " + connectionName : ""));
} }
} }
} }