beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Logging fixes

Browse source
This commit is contained in:
crschnick 2024-10-16 14:31:43 +00:00
parent 63bef7161a
commit 8a964cadad
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,9 +131,23 @@ public class TerminalLauncher {
entry != null ? color : null, adjustedTitle, cleanTitle, ps, ShellDialects.POWERSHELL); entry != null ? color : null, adjustedTitle, cleanTitle, ps, ShellDialects.POWERSHELL);
return config; return config;
} else { } else {
var found = sc.command(sc.getShellDialect().getWhichCommand("script")).executeAndCheck();
if (!found) {
var suffix = sc.getOsType() == OsType.MACOS ? "This command is available in the util-linux package which can be installed via homebrew." : "This command is available in the util-linux package.";
throw ErrorEvent.expected(new IllegalStateException("Logging requires the script command to be installed. " + suffix));
}
var content = sc.getOsType() == OsType.MACOS || sc.getOsType() == OsType.BSD ? var content = sc.getOsType() == OsType.MACOS || sc.getOsType() == OsType.BSD ?
"script -q \"%s\" \"%s\"".formatted(logFile, preparationScript) : """
"script --quiet --command \"%s\" \"%s\"".formatted(preparationScript, logFile); echo "Transcript started, output file is sessions/%s"
script -e -q "%s" "%s"
echo "Transcript stopped, output file is sessions/%s"
""".formatted(logFile.getFileName(), logFile, preparationScript, logFile.getFileName()) :
"""
echo "Transcript started, output file is sessions/%s"
script --quiet --command "%s" "%s"
echo "Transcript stopped, output file is sessions/%s"
""".formatted(logFile.getFileName(), preparationScript, logFile, logFile.getFileName());
var ps = ScriptHelper.createExecScript(sc.getShellDialect(), sc, content); var ps = ScriptHelper.createExecScript(sc.getShellDialect(), sc, content);
var config = new ExternalTerminalType.LaunchConfiguration( var config = new ExternalTerminalType.LaunchConfiguration(
entry != null ? color : null, adjustedTitle, cleanTitle, ps, sc.getShellDialect()); entry != null ? color : null, adjustedTitle, cleanTitle, ps, sc.getShellDialect());