From b8fa2ecaff5eadf4e2f0e8bf99ed24003bbd9596 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 4 Jan 2026 12:27:59 +0000
Subject: [PATCH] Create multi path term

---
 .../app/terminal/ExternalTerminalType.java    | 90 +++++++++++--------
 1 file changed, 54 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
index 7a03f94ef..e1a6f3975 100644
--- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
@@ -1,12 +1,10 @@
 package io.xpipe.app.terminal;
 
 import io.xpipe.app.ext.PrefsChoiceValue;
+import io.xpipe.app.issue.ErrorEventFactory;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.prefs.ExternalApplicationType;
-import io.xpipe.app.process.CommandBuilder;
-import io.xpipe.app.process.LocalShell;
-import io.xpipe.app.process.ShellDialects;
-import io.xpipe.app.process.TerminalInitFunction;
+import io.xpipe.app.process.*;
 import io.xpipe.app.update.AppDistributionType;
 import io.xpipe.core.OsType;
 
@@ -344,37 +342,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
             return CommandBuilder.of().add("-e").addFile(configuration.single().getScriptFile());
         }
     };
-    ExternalTerminalType UXTERM = new SimplePathType("app.uxterm", "uxterm", true) {
-        @Override
-        public TerminalOpenFormat getOpenFormat() {
-            return TerminalOpenFormat.NEW_WINDOW;
-        }
-
-        @Override
-        public String getWebsite() {
-            return "https://invisible-island.net/xterm/";
-        }
-
-        @Override
-        public boolean isRecommended() {
-            return false;
-        }
-
-        @Override
-        public boolean useColoredTitle() {
-            return true;
-        }
-
-        @Override
-        protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) {
-            return CommandBuilder.of()
-                    .add("-title")
-                    .addQuoted(configuration.getColoredTitle())
-                    .add("-e")
-                    .addFile(configuration.single().getScriptFile());
-        }
-    };
-    ExternalTerminalType XTERM = new SimplePathType("app.xterm", "xterm", true) {
+    ExternalTerminalType XTERM = new MultiPathType("app.xterm",  true, List.of("uxterm", "xterm")) {
         @Override
         public TerminalOpenFormat getOpenFormat() {
             return TerminalOpenFormat.NEW_WINDOW;
@@ -509,7 +477,6 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
             GUAKE,
             TILDA,
             COSMIC_TERM,
-            UXTERM,
             XTERM,
             DEEPIN_TERMINAL,
             FOOT,
@@ -673,4 +640,55 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
 
         protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration);
     }
+
+    abstract class MultiPathType implements ExternalApplicationType.PathApplication, TrackableTerminalType {
+
+        @Getter
+        private final String id;
+
+        @Getter
+        private final List<String> executables;
+
+        private final boolean async;
+
+        private String executable;
+
+        public MultiPathType(String id, boolean async, List<String> executables) {
+            this.id = id;
+            this.executables = executables;
+            this.async = async;
+        }
+
+        @Override
+        public boolean detach() {
+            return async;
+        }
+
+        @Override
+        public void launch(TerminalLaunchConfiguration configuration) throws Exception {
+            var args = toCommand(configuration);
+            launch(args);
+        }
+
+        @Override
+        public String getExecutable() {
+            if (executable != null) {
+                return executable;
+            }
+
+            for (String executable : executables) {
+                try (ShellControl pc = LocalShell.getShell()) {
+                    if (pc.view().findProgram(executable).isPresent()) {
+                        return (this.executable = executable);
+                    }
+                } catch (Exception e) {
+                    ErrorEventFactory.fromThrowable(e).omit().handle();
+                }
+            }
+
+            return (executable = executables.getFirst());
+        }
+
+        protected abstract CommandBuilder toCommand(TerminalLaunchConfiguration configuration);
+    }
 }