h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-20 07:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

config_paths: fix compiled-in locale dir for installed, non-embed builds

Browse Source 
Commit bf65b9e3a7 (Change `gettext` paths to be relocatable (#11195),
2025-03-30) broke the locale path.

Commit c3740b85be (config_paths: fix compiled-in locale dir,
2025-06-12) fixed what it calls "case 4", but "case 2" is also
affected; fix that. Before/after:

	$ ~/.local/opt/fish/bin/fish -d config
	paths.locale: /home/johannes/.local/opt/fish/share/fish/locale
	$ ~/.local/opt/fish/bin/fish -d config
	paths.locale: /home/johannes/.local/opt/fish/share/locale

Fixes https://github.com/fish-shell/fish-shell/issues/11683#issuecomment-3218190662
This commit is contained in:
Johannes Altmanninger
2025-08-25 10:03:52 +02:00
parent 67e8657109
commit 21a07f08a3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/env/config_paths.rs vendored
View File

@@ -57,6 +57,8 @@
let data_dir = base_path.join("share/fish/install");
#[cfg(not(feature = "embed-data"))]
let data_dir = base_path.join("share/fish");
let locale =
(!cfg!(feature = "embed-data")).then(|| base_path.join("share/locale"));
paths = ConfigPaths {
// One obvious path is ~/.local (with fish in ~/.local/bin/).
// If we picked ~/.local/share/fish as our data path,
@@ -66,7 +68,7 @@
sysconf: base_path.join("etc/fish"),
doc: base_path.join("share/doc/fish"),
bin: Some(base_path.join("bin")),
locale: Some(data_dir.join("locale")),
locale,
}
} else if exec_path.ends_with("fish") {
FLOG!(