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

Merge pull request #2712 from notcancername/set-xdg-data-dirs-default

Browse Source 
Append the default value of XDG_DATA_DIRS when setting up shell integration
This commit is contained in:
Mitchell Hashimoto
2024-11-18 06:24:35 -08:00
committed by GitHub
parent 86c601f136 3e971f2837
commit e747345b03
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/termio/shell_integration.zig
View File

@ -447,27 +447,31 @@ fn setupXdgDataDirs(
// so that our modifications don't interfere with other commands. // so that our modifications don't interfere with other commands.
try env.put("GHOSTTY_SHELL_INTEGRATION_XDG_DIR", integ_dir); try env.put("GHOSTTY_SHELL_INTEGRATION_XDG_DIR", integ_dir);
if (env.get("XDG_DATA_DIRS")) |old| { {
// We have an old value, We need to prepend our value to it. const xdg_data_dir_key = "XDG_DATA_DIRS";
// We attempt to avoid allocating by using the stack up to 4K. // We attempt to avoid allocating by using the stack up to 4K.
// Max stack size is considerably larger on macOS and Linux but // Max stack size is considerably larger on macOS and Linux but
// 4K is a reasonable size for this for most cases. However, env // 4K is a reasonable size for this for most cases. However, env
// vars can be significantly larger so if we have to we fall // vars can be significantly larger so if we have to we fall
// back to a heap allocated value. // back to a heap allocated value.
var stack_alloc = std.heap.stackFallback(4096, alloc_arena); var stack_alloc_state = std.heap.stackFallback(4096, alloc_arena);
const alloc = stack_alloc.get(); const stack_alloc = stack_alloc_state.get();
const prepended = try std.fmt.allocPrint(
alloc,
"{s}{c}{s}",
.{ integ_dir, std.fs.path.delimiter, old },
);
defer alloc.free(prepended);
try env.put("XDG_DATA_DIRS", prepended); // If no XDG_DATA_DIRS set use the default value as specified.
} else { // This ensures that the default directories aren't lost by setting
// No XDG_DATA_DIRS set, we just set it our desired value. // our desired integration dir directly. See #2711.
try env.put("XDG_DATA_DIRS", integ_dir); // <https://specifications.freedesktop.org/basedir-spec/0.6/#variables>
const old = env.get(xdg_data_dir_key) orelse "/usr/local/share:/usr/share";
const prepended = try std.fmt.allocPrint(stack_alloc, "{s}{c}{s}", .{
integ_dir,
std.fs.path.delimiter,
old,
});
defer stack_alloc.free(prepended);
try env.put(xdg_data_dir_key, prepended);
} }
} }