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

config_paths: use immutable/SSA style for determining config paths

Browse Source 
This logic is extremely confusing because it creates a ConfigPaths
object only to throw it away later. Fix that.
This commit is contained in:
Johannes Altmanninger
2025-09-13 12:33:40 +02:00
parent 8640ce8148
commit 6cddceb37a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/env/config_paths.rs vendored
View File

@@ -5,7 +5,6 @@
/// A struct of configuration directories, determined in main() that fish will optionally pass to
/// env_init.
#[derive(Default)]
pub struct ConfigPaths {
pub sysconf: PathBuf, // e.g., /usr/local/etc
pub bin: Option<PathBuf>, // e.g., /usr/local/bin
@@ -115,27 +114,28 @@ fn new(argv0: &Path, exec_path: PathBuf) -> Self {
};
}
let mut paths = ConfigPaths::default();
// The next check is that we are in a relocatable directory tree
if exec_path.ends_with("bin/fish") {
let base_path = exec_path.parent().unwrap().parent().unwrap();
paths = ConfigPaths {
sysconf: base_path.join("etc/fish"),
bin: Some(base_path.join("bin")),
data: base_path.join("share/fish"),
doc: base_path.join("share/doc/fish"),
locale: base_path.join("share/locale"),
let data = base_path.join("share/fish");
let sysconf = base_path.join("etc/fish");
if data.exists() && sysconf.exists() {
let doc = base_path.join("share/doc/fish");
return ConfigPaths {
sysconf,
bin: Some(base_path.join("bin")),
data,
// The docs dir may not exist; in that case fall back to the compiled in path.
doc: if doc.exists() {
doc
} else {
PathBuf::from(DOC_DIR)
},
locale: base_path.join("share/locale"),
};
}
}
if paths.data.exists() && paths.sysconf.exists() {
// The docs dir may not exist; in that case fall back to the compiled in path.
if !paths.doc.exists() {
paths.doc = PathBuf::from(DOC_DIR);
}
return paths;
}
Self::static_paths()
}
}