mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-09-17 11:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: include ghostty subdirectory under Resources

Browse Source 
This enables us to treat Ghostty's resources directory the same way
whether it is installed in a macOS app bundle or under e.g. /usr/share.
This commit is contained in:
Gregory Anders
2023-12-20 15:25:30 -06:00
committed by Mitchell Hashimoto
parent 8751502878
commit 18f2fb3fbd
3 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/termio/Exec.zig
View File

@@ -762,25 +762,13 @@ const Subprocess = struct {
try env.put("TERM", opts.config.term);
try env.put("COLORTERM", "truecolor");
// Assume that the resources directory is adjacent to the terminfo
// database
var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
const terminfo_dir = terminfo_dir: {
// On macOS the terminfo directory can be inside the resources
// directory, so check if that is the case
if (comptime builtin.target.isDarwin()) {
if (try internal_os.maybeDir(&buf, base, "terminfo", "ghostty.termcap")) |v| {
break :terminfo_dir v;
}
}
// Otherwise we assume the terminfo directory is adjacent to the
// resources directory
const parent = std.fs.path.basename(base);
break :terminfo_dir try internal_os.maybeDir(&buf, parent, "terminfo", "ghostty.termcap");
};
if (terminfo_dir) |dir| {
try env.put("TERMINFO", dir);
}
const dir = try std.fmt.bufPrint(&buf, "{s}/terminfo", .{
std.fs.path.dirname(base) orelse unreachable,
});
try env.put("TERMINFO", dir);
} else {
if (comptime builtin.target.isDarwin()) {
log.warn("ghostty terminfo not found, using xterm-256color", .{});