CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-06-28 11:00:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

Rework init commands for warp

Browse source
This commit is contained in:
crschnick 2024-04-21 03:22:23 +00:00
parent 73bc99b3c6
commit 0a3488324d
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
View file

@ -575,6 +575,20 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
return toExecute.buildSimple();
};
}
@Override
public String additionalInitCommands(ShellControl sc) {
if (sc.getShellDialect() == ShellDialects.ZSH) {
return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"zsh\"}}\\x9c'";
}
if (sc.getShellDialect() == ShellDialects.BASH) {
return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"bash\"}}\\x9c'";
}
if (sc.getShellDialect() == ShellDialects.FISH) {
return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"fish\"}}\\x9c'";
}
return null;
}
};
ExternalTerminalType CUSTOM = new CustomTerminalType();
List<ExternalTerminalType> WINDOWS_TERMINALS = List.of(
@ -656,6 +670,10 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
.orElse(null);
}
default String additionalInitCommands(ShellControl sc) {
return null;
}
boolean supportsTabs();
default String getWebsite() {

6
app/src/main/java/io/xpipe/app/util/TerminalLauncher.java
View file

@ -31,7 +31,8 @@ public class TerminalLauncher {
new TerminalInitScriptConfig(
title,
type.shouldClear()
&& AppPrefs.get().clearTerminalOnInit().get()));
&& AppPrefs.get().clearTerminalOnInit().get(),
type.additionalInitCommands(sc)));
var config = new ExternalTerminalType.LaunchConfiguration(null, title, title, script, sc.getShellDialect());
type.launch(config);
}
@ -53,7 +54,8 @@ public class TerminalLauncher {
var adjustedTitle = prefix + cleanTitle;
var terminalConfig = new TerminalInitScriptConfig(
adjustedTitle,
type.shouldClear() && AppPrefs.get().clearTerminalOnInit().get());
type.shouldClear() && AppPrefs.get().clearTerminalOnInit().get(),
cc instanceof ShellControl sc ? type.additionalInitCommands(sc) : null);
var request = UUID.randomUUID();
var d = ProcessControlProvider.get().getEffectiveLocalDialect();

3
core/src/main/java/io/xpipe/core/process/TerminalInitScriptConfig.java
View file

@ -7,8 +7,9 @@ public class TerminalInitScriptConfig {
String displayName;
boolean clearScreen;
String terminalSpecificCommands;
public static TerminalInitScriptConfig ofName(String name) {
return new TerminalInitScriptConfig(name, true);
return new TerminalInitScriptConfig(name, true, null);
}
}