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

shell-integration: expand bash HISTFILE value

Browse Source 
bash reads HISTFILE at startup to locate its history file, but this is
apparently too early for it to be able to expand home-relative paths. We
now manually expand the full path and add that to the environment.
This commit is contained in:
Jon Parise
2024-05-08 07:49:46 -07:00
parent 2b785127b1
commit 054e01eaaf
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/termio/shell_integration.zig
View File

@ -3,6 +3,7 @@ const Allocator = std.mem.Allocator;
const ArenaAllocator = std.heap.ArenaAllocator; const ArenaAllocator = std.heap.ArenaAllocator;
const EnvMap = std.process.EnvMap; const EnvMap = std.process.EnvMap;
const config = @import("../config.zig"); const config = @import("../config.zig");
const homedir = @import("../os/homedir.zig");
const log = std.log.scoped(.shell_integration); const log = std.log.scoped(.shell_integration);
@ -178,13 +179,23 @@ fn setupBash(
} }
try env.put("GHOSTTY_BASH_INJECT", inject.slice()); try env.put("GHOSTTY_BASH_INJECT", inject.slice());
// In POSIX mode, HISTFILE defaults to ~/.sh_history. // In POSIX mode, HISTFILE defaults to ~/.sh_history, so unless we're
// staying in POSIX mode (--posix), change it back to ~/.bash_history.
if (!posix and env.get("HISTFILE") == null) { if (!posix and env.get("HISTFILE") == null) {
try env.put("HISTFILE", "~/.bash_history"); var home_buf: [1024]u8 = undefined;
try env.put("GHOSTTY_BASH_UNEXPORT_HISTFILE", "1"); if (try homedir.home(&home_buf)) |home| {
var histfile_buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
const histfile = try std.fmt.bufPrint(
&histfile_buf,
"{s}/.bash_history",
.{home},
);
try env.put("HISTFILE", histfile);
try env.put("GHOSTTY_BASH_UNEXPORT_HISTFILE", "1");
}
} }
// Preserve the existing ENV value in POSIX mode. // Preserve the existing ENV value when staying in POSIX mode (--posix).
if (env.get("ENV")) |old| { if (env.get("ENV")) |old| {
if (posix) { if (posix) {
try env.put("GHOSTTY_BASH_ENV", old); try env.put("GHOSTTY_BASH_ENV", old);
@ -298,7 +309,7 @@ test "bash: HISTFILE" {
const command = try setupBash(alloc, "bash", ".", &env); const command = try setupBash(alloc, "bash", ".", &env);
defer if (command) |c| alloc.free(c); defer if (command) |c| alloc.free(c);
try testing.expectEqualStrings("~/.bash_history", env.get("HISTFILE").?); try testing.expect(std.mem.endsWith(u8, env.get("HISTFILE").?, ".bash_history"));
try testing.expectEqualStrings("1", env.get("GHOSTTY_BASH_UNEXPORT_HISTFILE").?); try testing.expectEqualStrings("1", env.get("GHOSTTY_BASH_UNEXPORT_HISTFILE").?);
} }