Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: disable forced shell integration for -e (#3001)

Browse Source 
This prevents forcibly injecting any configured shell integration into
the command's environment. Automatic shell detection is enabled, unless
shell integration has been explicitly disabled.
This commit is contained in:
Mitchell Hashimoto
2024-12-17 12:18:58 -08:00
committed by GitHub
parent 2725d5ecb3 a2c546c8d1
commit 08f8845dd4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/config/Config.zig
View File

@ -618,6 +618,16 @@ command: ?[]const u8 = null,
/// process will exit when the command exits. Additionally, the /// process will exit when the command exits. Additionally, the
/// `quit-after-last-window-closed-delay` is unset. /// `quit-after-last-window-closed-delay` is unset.
/// ///
/// * `shell-integration=detect` (if not `none`) - This prevents forcibly
/// injecting any configured shell integration into the command's
/// environment. With `-e` its highly unlikely that you're executing a
/// shell and forced shell integration is likely to cause problems
/// (i.e. by wrapping your command in a shell, setting env vars, etc.).
/// This is a safety measure to prevent unexpected behavior. If you want
/// shell integration with a `-e`-executed command, you must either
/// name your binary appopriately or source the shell integration script
/// manually.
///
@"initial-command": ?[]const u8 = null, @"initial-command": ?[]const u8 = null,
/// If true, keep the terminal open after the command exits. Normally, the /// If true, keep the terminal open after the command exits. Normally, the
@ -3091,6 +3101,9 @@ pub fn parseManuallyHook(
self.@"gtk-single-instance" = .false; self.@"gtk-single-instance" = .false;
self.@"quit-after-last-window-closed" = true; self.@"quit-after-last-window-closed" = true;
self.@"quit-after-last-window-closed-delay" = null; self.@"quit-after-last-window-closed-delay" = null;
if (self.@"shell-integration" != .none) {
self.@"shell-integration" = .detect;
}
// Do not continue, we consumed everything. // Do not continue, we consumed everything.
return false; return false;