Show name of system in path check

xpipe-io · Jun 8, 2023 · 5dd9a3c · 5dd9a3c
1 parent ed60342
commit 5dd9a3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
@@ -125,7 +125,7 @@ protected Optional<Path> determinePath() {
         @Override
         public void launch(String name, String file, boolean elevated) throws Exception {
             try (ShellControl pc = LocalStore.getShell()) {
-                ApplicationHelper.checkSupport(pc, executable, getDisplayName());
+                ApplicationHelper.checkSupport(pc, executable, getDisplayName(), null);
 
                 var toExecute = executable + " " + toCommand(name, file);
                 // In order to fix this bug which also affects us:
@@ -367,7 +367,7 @@ public void launch(String name, String file, boolean elevated) throws Exception
                     try (ShellControl pc = LocalStore.getShell()
                             .subShell(ShellDialects.POWERSHELL)
                             .start()) {
-                        ApplicationHelper.checkSupport(pc, executable, displayName);
+                        ApplicationHelper.checkSupport(pc, executable, displayName, null);
                         var toExecute = "Start-Process \"" + executable + "\" -Verb RunAs -ArgumentList \""
                                 + toCommand(name, file).replaceAll("\"", "`\"") + "\"";
                         pc.executeSimpleCommand(toExecute);
@@ -377,7 +377,7 @@ public void launch(String name, String file, boolean elevated) throws Exception
             }
 
             try (ShellControl pc = LocalStore.getShell()) {
-                ApplicationHelper.checkSupport(pc, executable, displayName);
+                ApplicationHelper.checkSupport(pc, executable, displayName, null);
 
                 var toExecute = executable + " " + toCommand(name, file);
                 if (pc.getOsType().equals(OsType.WINDOWS)) {

diff --git a/app/src/main/java/io/xpipe/app/util/ApplicationHelper.java b/app/src/main/java/io/xpipe/app/util/ApplicationHelper.java
@@ -27,10 +27,10 @@ public static boolean isInPath(ShellControl processControl, String executable) t
                 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 {
         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 : ""));
         }
     }
 }