beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-19 22:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
crschnick 2024-04-21 04:48:44 +00:00
parent 409b24ff8a
commit eb873f2225
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/xpipe/app/util/ScriptHelper.java
View file

@ -33,7 +33,8 @@ public class ScriptHelper {
WorkingDirectoryFunction workingDirectory, WorkingDirectoryFunction workingDirectory,
List<String> init, List<String> init,
String toExecuteInShell, String toExecuteInShell,
TerminalInitScriptConfig config) TerminalInitScriptConfig config,
boolean exit)
throws Exception { throws Exception {
String nl = t.getNewLine().getNewLineString(); String nl = t.getNewLine().getNewLineString();
var content = ""; var content = "";
@ -71,7 +72,10 @@ public class ScriptHelper {
if (toExecuteInShell != null) { if (toExecuteInShell != null) {
// Normalize line endings // Normalize line endings
content += String.join(nl, toExecuteInShell.lines().toList()) + nl; content += String.join(nl, toExecuteInShell.lines().toList()) + nl;
content += nl + t.getPassthroughExitCommand() + nl; }
if (exit) {
content += nl + t.getPassthroughExitCommand();
} }
return createExecScript(t, processControl, new FilePath(t.initFileName(processControl)), content); return createExecScript(t, processControl, new FilePath(t.initFileName(processControl)), content);

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

@ -32,7 +32,8 @@ public class TerminalLauncher {
title, title,
type.shouldClear() type.shouldClear()
&& AppPrefs.get().clearTerminalOnInit().get(), && AppPrefs.get().clearTerminalOnInit().get(),
null)); null),
true);
var config = new ExternalTerminalType.LaunchConfiguration(null, title, title, script, sc.getShellDialect()); var config = new ExternalTerminalType.LaunchConfiguration(null, title, title, script, sc.getShellDialect());
type.launch(config); type.launch(config);
} }