From 321be2d5ad223a451b63acd8229a7adc5598b6cf Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 5 Aug 2023 21:38:32 -0700 Subject: [PATCH] termio: respect GHOSTTY_RESOURCES_DIR --- src/termio/Exec.zig | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig index 88881299a..79f368282 100644 --- a/src/termio/Exec.zig +++ b/src/termio/Exec.zig @@ -533,10 +533,18 @@ const Subprocess = struct { // Get our bundled resources directory, if it exists. We use this // for terminfo, shell-integration, etc. - const resources_dir = try resourcesDir(alloc); - if (resources_dir) |dir| { - try env.put("GHOSTTY_RESOURCES_DIR", dir); - } + const resources_key = "GHOSTTY_RESOURCES_DIR"; + const resources_dir = if (env.get(resources_key)) |dir| dir: { + log.info("using Ghostty resources dir from env var: {s}", .{dir}); + break :dir dir; + } else if (try resourcesDir(alloc)) |dir| dir: { + log.info("found Ghostty resources dir: {s}", .{dir}); + try env.put(resources_key, dir); + break :dir dir; + } else dir: { + log.warn("Ghostty resources dir not found, some features disabled", .{}); + break :dir null; + }; // Set our TERM var. This is a bit complicated because we want to use // the ghostty TERM value but we want to only do that if we have