From c511a721879d9e565c4f71e2af4f7266ad33639d Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 26 Apr 2023 13:45:32 +0000
Subject: [PATCH] Rework shell detection and initialization

This should fix some issues with Powershell Core and ttys
---
 app/src/main/java/io/xpipe/app/util/ScriptHelper.java      | 2 +-
 core/src/main/java/io/xpipe/core/process/ShellDialect.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
index c848d68c7..63ef2a194 100644
--- a/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/ScriptHelper.java
@@ -42,7 +42,7 @@ public class ScriptHelper {
             ShellControl processControl, List<String> init, String toExecuteInShell, boolean login) {
         ShellDialect t = processControl.getShellDialect();
         String nl = t.getNewLine().getNewLineString();
-        var content = String.join(nl, init) + nl;
+        var content = String.join(nl, init.stream().filter(s -> s != null).toList()) + nl;
 
         if (login) {
             var applyProfilesCommand = t.applyProfileFilesCommand();
diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialect.java b/core/src/main/java/io/xpipe/core/process/ShellDialect.java
index 011194f9a..ac2be0c46 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellDialect.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellDialect.java
@@ -19,6 +19,10 @@ public interface ShellDialect {
 
     String fileArgument(String s);
 
+    void prepareDumbTerminalCommands(ShellControl sc) throws Exception;
+
+    String prepareProperTerminalCommands();
+
     default String applyRcFileCommand() {
         return null;
     }