mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-06-08 21:04:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(shell-integration): refactor to make cases alphabetical

Browse Source 
also refactors elvish file to evade unobvious returns
and tries to fix some build errors
This commit is contained in:
ilk
2024-05-17 18:02:03 +03:00
committed by Mitchell Hashimoto
parent 1fa830cc73
commit 7377ca8917
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/termio/shell_integration.zig
View File

@@ -10,9 +10,9 @@ const log = std.log.scoped(.shell_integration);
/// Shell types we support
pub const Shell = enum {
bash,
elvish,
fish,
zsh,
elvish,
};
/// The result of setting up a shell integration.
@@ -46,9 +46,9 @@ pub fn setup(
) !?ShellIntegration {
const exe = if (force_shell) |shell| switch (shell) {
.bash => "bash",
.elvish => "elvish",
.fish => "fish",
.zsh => "zsh",
.elvish => "elvish",
} 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.
@@ -70,18 +70,18 @@ pub fn setup(
};
}
if (std.mem.eql(u8, "fish", exe)) {
try setupFish(alloc_arena, resource_dir, env);
if (std.mem.eql(u8, "elvish", exe)) {
try setupXdgDataDirs(alloc_arena, resource_dir, env);
break :shell .{
.shell = .fish,
.shell = .elvish,
.command = command,
};
}
if (std.mem.eql(u8, "elvish", exe)) {
try setupElvish(alloc_arena, resource_dir, env);
if (std.mem.eql(u8, "fish", exe)) {
try setupXdgDataDirs(alloc_arena, resource_dir, env);
break :shell .{
.shell = .elvish,
.shell = .fish,
.command = command,
};
}
@@ -415,11 +415,14 @@ test "bash: preserve ENV" {
}
}
/// Setup the fish automatic shell integration. This works by
/// modify XDG_DATA_DIRS to include the resource directory.
/// Fish will automatically load configuration in XDG_DATA_DIRS
/// "fish/vendor_conf.d/*.fish".
fn setupFish(
/// Setup automatic shell integration for shells that include
/// their modules from paths in `XDG_DATA_DIRS` env variable.
///
/// Path of shell-integration dir is prepended to `XDG_DATA_DIRS`.
/// It is also saved in `GHOSTTY_INTEGRATION_DIR` variable so that
/// the shell can refer to it and safely remove this directory
/// from `XDG_DATA_DIRS` when integration is complete.
fn setupXdgDataDirs(
alloc_arena: Allocator,
resource_dir: []const u8,
env: *EnvMap,
@@ -436,7 +439,7 @@ fn setupFish(
// Set an env var so we can remove this from XDG_DATA_DIRS later.
// This happens in the shell integration config itself. We do this
// so that our modifications don't interfere with other commands.
try env.put("GHOSTTY_FISH_XDG_DIR", integ_dir);
try env.put("GHOSTTY_INTEGRATION_DIR", integ_dir);
if (env.get("XDG_DATA_DIRS")) |old| {
// We have an old value, We need to prepend our value to it.
@@ -462,18 +465,6 @@ fn setupFish(
}
}
/// Setup the Elvish automatic shell integration.
/// This reuses integration primitives of Fish, as Elvish also
/// loads config in XDG_DATA_DIRS (except it imports
/// "./elvish/lib/*.elv" files).
fn setupElvish(
alloc_arena: Allocator,
resource_dir: []const u8,
env: *EnvMap,
) !void {
try setupFish(alloc_arena, resource_dir, env);
}
/// Setup the zsh automatic shell integration. This works by setting
/// ZDOTDIR to our resources dir so that zsh will load our config. This
/// config then loads the true user config.