From 41d419f19d18cd9754806b8c3da3ee36c579a061 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 24 Aug 2024 21:58:10 +0000
Subject: [PATCH] mobaxterm fixes

---
 .../app/terminal/ExternalTerminalType.java    | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 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 1efb7c969..99ad4ad4a 100644
--- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
@@ -1,6 +1,5 @@
 package io.xpipe.app.terminal;
 
-import io.xpipe.app.beacon.AppBeaconServer;
 import io.xpipe.app.comp.base.MarkdownComp;
 import io.xpipe.app.core.AppCache;
 import io.xpipe.app.core.AppI18n;
@@ -13,12 +12,9 @@ import io.xpipe.app.util.*;
 import io.xpipe.core.process.*;
 import io.xpipe.core.store.FilePath;
 import io.xpipe.core.util.FailableFunction;
-import io.xpipe.core.util.XPipeInstallation;
-
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
-
 import lombok.Getter;
 import lombok.Value;
 import lombok.With;
@@ -240,32 +236,24 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
         @Override
         protected void execute(Path file, LaunchConfiguration configuration) throws Exception {
             try (var sc = LocalShell.getShell()) {
-                // Since mobaxterm uses its own cygwin environment, we have to provide the beacon auth secret to the tmp
-                // there as well
-                // Otherwise it can't connect
-                var slashTemp = Path.of(System.getenv("APPDATA"), "MobaXterm", "slash", "tmp");
-                if (Files.exists(slashTemp)) {
-                    var authFileName = XPipeInstallation.getLocalBeaconAuthFile()
-                            .getFileName()
-                            .toString();
-                    Files.writeString(
-                            Path.of(slashTemp.toString(), authFileName),
-                            AppBeaconServer.get().getLocalAuthSecret());
-                }
-
-                var fixedFile = configuration
-                        .getScriptFile()
+                SshLocalBridge.init();
+                var b = SshLocalBridge.get();
+                var command = CommandBuilder.of()
+                        .addFile("ssh")
+                        .addQuoted(b.getUser() + "@localhost")
+                        .add("-i")
+                        .add("\"$(cygpath \"" + b.getIdentityKey().toString() + "\")\"")
+                        .add("-p")
+                        .add("" + b.getPort());
+                var script = ScriptHelper.createExecScript(ShellDialects.BASH, sc, command.buildFull(sc));
+                var fixedFile = script
                         .toString()
                         .replaceAll("\\\\", "/")
                         .replaceAll("\\s", "\\$0");
-                var command = sc.getShellDialect() == ShellDialects.CMD
-                        ? CommandBuilder.of().addQuoted("cmd /c " + fixedFile)
-                        : CommandBuilder.of()
-                                .addQuoted("powershell -NoProfile -ExecutionPolicy Bypass -File " + fixedFile);
                 sc.command(CommandBuilder.of()
                                 .addFile(file.toString())
                                 .add("-newtab")
-                                .add(command))
+                                .add(fixedFile))
                         .execute();
             }
         }