Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Error out when share/config.fish can't be read

Browse source 
This file contains important configuration, so if we can't get it
something is broken.

We don't *exit*, but we will stop reading configuration.
This commit is contained in:
Fabian Boehm 2024-01-31 15:46:05 +01:00
parent 623f3463a5
commit 662fde7b71
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/bin/fish.rs
View file

@ -247,7 +247,8 @@ fn determine_config_directory_paths(argv0: impl AsRef<Path>) -> ConfigPaths {
} }
// Source the file config.fish in the given directory. // Source the file config.fish in the given directory.
fn source_config_in_directory(parser: &Parser, dir: &wstr) { // Returns true if successful, false if not.
fn source_config_in_directory(parser: &Parser, dir: &wstr) -> bool {
// If the config.fish file doesn't exist or isn't readable silently return. Fish versions up // If the config.fish file doesn't exist or isn't readable silently return. Fish versions up
// thru 2.2.0 would instead try to source the file with stderr redirected to /dev/null to deal // thru 2.2.0 would instead try to source the file with stderr redirected to /dev/null to deal
// with that possibility. // with that possibility.
@ -263,7 +264,7 @@ fn source_config_in_directory(parser: &Parser, dir: &wstr) {
"not sourcing %ls (not readable or does not exist)", "not sourcing %ls (not readable or does not exist)",
escaped_pathname escaped_pathname
); );
return; return false;
} }
FLOG!(config, "sourcing", escaped_pathname); FLOG!(config, "sourcing", escaped_pathname);
@ -272,11 +273,25 @@ fn source_config_in_directory(parser: &Parser, dir: &wstr) {
parser.libdata_mut().pods.within_fish_init = true; parser.libdata_mut().pods.within_fish_init = true;
let _ = parser.eval(&cmd, &IoChain::new()); let _ = parser.eval(&cmd, &IoChain::new());
parser.libdata_mut().pods.within_fish_init = false; parser.libdata_mut().pods.within_fish_init = false;
return true;
} }
/// Parse init files. exec_path is the path of fish executable as determined by argv[0]. /// Parse init files. exec_path is the path of fish executable as determined by argv[0].
fn read_init(parser: &Parser, paths: &ConfigPaths) { fn read_init(parser: &Parser, paths: &ConfigPaths) {
source_config_in_directory(parser, &str2wcstring(paths.data.as_os_str().as_bytes())); let datapath = str2wcstring(paths.data.as_os_str().as_bytes());
if !source_config_in_directory(parser, &datapath) {
// If we cannot read share/config.fish, our internal configuration,
// something is wrong.
// That also means that our functions won't be found,
// and so any config we get would almost certainly be broken.
let escaped_pathname = escape(&datapath);
FLOGF!(
error,
"Fish cannot find its asset files in '%ls'. Refusing to read configuration.",
escaped_pathname
);
return;
}
source_config_in_directory(parser, &str2wcstring(paths.sysconf.as_os_str().as_bytes())); source_config_in_directory(parser, &str2wcstring(paths.sysconf.as_os_str().as_bytes()));
// We need to get the configuration directory before we can source the user configuration file. // We need to get the configuration directory before we can source the user configuration file.