Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-21 11:16:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698 from jparise/exec-command-path

Browse Source 
termio: pass full command to shell integration
This commit is contained in:
Mitchell Hashimoto
2024-04-30 14:10:58 -07:00
committed by GitHub
parent f99823ec38 54f6abf1cf
commit 187653e9cd
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/termio/Exec.zig
View File

@ -906,8 +906,8 @@ const Subprocess = struct {
errdefer arena.deinit(); errdefer arena.deinit();
const alloc = arena.allocator(); const alloc = arena.allocator();
// Determine the path to the binary we're executing // Determine the shell command we're executing
const default_path = switch (builtin.os.tag) { const shell_command = opts.full_config.command orelse switch (builtin.os.tag) {
.windows => "cmd.exe", .windows => "cmd.exe",
else => "sh", else => "sh",
}; };
@ -1054,7 +1054,7 @@ const Subprocess = struct {
const cmd = try std.fmt.allocPrint( const cmd = try std.fmt.allocPrint(
alloc, alloc,
"exec -l {s}", "exec -l {s}",
.{opts.full_config.command orelse default_path}, .{shell_command},
); );
// The reason for executing login this way is unclear. This // The reason for executing login this way is unclear. This
@ -1145,7 +1145,7 @@ const Subprocess = struct {
try args.append("-c"); try args.append("-c");
} }
try args.append(opts.full_config.command orelse default_path); try args.append(shell_command);
break :args try args.toOwnedSlice(); break :args try args.toOwnedSlice();
}; };
@ -1165,20 +1165,12 @@ const Subprocess = struct {
.zsh => .zsh, .zsh => .zsh,
}; };
// We have to get the path to the executing shell. The command
// can be a full shell string with arguments so we look for a space
// and take the first part.
const path = if (opts.full_config.command) |cmd| path: {
const idx = std.mem.indexOfScalar(u8, cmd, ' ') orelse cmd.len;
break :path cmd[0..idx];
} else default_path;
const dir = opts.resources_dir orelse break :shell null; const dir = opts.resources_dir orelse break :shell null;
break :shell try shell_integration.setup( break :shell try shell_integration.setup(
gpa, gpa,
dir, dir,
path, shell_command,
&env, &env,
force, force,
opts.full_config.@"shell-integration-features", opts.full_config.@"shell-integration-features",

9
src/termio/shell_integration.zig
View File

@ -23,7 +23,7 @@ pub const Shell = enum {
pub fn setup( pub fn setup(
alloc: Allocator, alloc: Allocator,
resource_dir: []const u8, resource_dir: []const u8,
command_path: []const u8, command: []const u8,
env: *EnvMap, env: *EnvMap,
force_shell: ?Shell, force_shell: ?Shell,
features: config.ShellIntegrationFeatures, features: config.ShellIntegrationFeatures,
@ -31,7 +31,12 @@ pub fn setup(
const exe = if (force_shell) |shell| switch (shell) { const exe = if (force_shell) |shell| switch (shell) {
.fish => "fish", .fish => "fish",
.zsh => "zsh", .zsh => "zsh",
} else std.fs.path.basename(command_path); } else exe: {
// The command can include arguments. Look for the first space
// and use the basename of the first part as the command's exe.
const idx = std.mem.indexOfScalar(u8, command, ' ') orelse command.len;
break :exe std.fs.path.basename(command[0..idx]);
};
const shell: Shell = shell: { const shell: Shell = shell: {
if (std.mem.eql(u8, "fish", exe)) { if (std.mem.eql(u8, "fish", exe)) {