Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

termio: remove xcode-injected env vars

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-02-18 09:46:49 -08:00
parent 573b163636
commit 7fc9d1bf52
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/termio/Exec.zig
View File

@ -3,6 +3,7 @@ pub const Exec = @This();
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin"); const builtin = @import("builtin");
const build_config = @import("../build_config.zig");
const assert = std.debug.assert; const assert = std.debug.assert;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const termio = @import("../termio.zig"); const termio = @import("../termio.zig");
@ -361,6 +362,21 @@ const Subprocess = struct {
try env.put("TERM", "xterm-256color"); try env.put("TERM", "xterm-256color");
try env.put("COLORTERM", "truecolor"); try env.put("COLORTERM", "truecolor");
// When embedding in macOS and running via XCode, XCode injects
// a bunch of things that break our shell process. We remove those.
if (comptime builtin.target.isDarwin() and build_config.artifact == .lib) {
if (env.get("__XCODE_BUILT_PRODUCTS_DIR_PATHS") != null) {
env.remove("__XCODE_BUILT_PRODUCTS_DIR_PATHS");
env.remove("__XPC_DYLD_LIBRARY_PATH");
env.remove("DYLD_FRAMEWORK_PATH");
env.remove("DYLD_INSERT_LIBRARIES");
env.remove("DYLD_LIBRARY_PATH");
env.remove("LD_LIBRARY_PATH");
env.remove("SECURITYSESSIONID");
env.remove("XPC_SERVICE_NAME");
}
}
return .{ return .{
.env = env, .env = env,
.cwd = opts.config.@"working-directory", .cwd = opts.config.@"working-directory",
@ -529,7 +545,7 @@ const ReadThread = struct {
return; return;
}; };
log.info("DATA: {d}", .{n}); // log.info("DATA: {d}", .{n});
@call(.always_inline, process, .{ ev, buf[0..n] }); @call(.always_inline, process, .{ ev, buf[0..n] });
} }
} }