Only use DATADIR in $fish_function_path if no-config is used

This only uses the functions fish ships with, but still doesn't allow
any *customization*, which is the point of no-config.

This makes it a lot more usable, given that the actual normal prompt
and things are there.

This still doesn't set any colors, because we don't run
__fish_config_interactive because we don't read config.fish (any
config.fish), because that would run the snippets.
This commit is contained in:
Fabian Homborg
2021-04-11 11:52:30 +02:00
parent 848f7a0787
commit 5ddb1adac1
3 changed files with 20 additions and 1 deletions

View File

@@ -282,6 +282,9 @@ void env_init(const struct config_paths_t *paths, bool do_uvars) {
vars.set_one(FISH_SYSCONFDIR_VAR, ENV_GLOBAL, paths->sysconf);
vars.set_one(FISH_HELPDIR_VAR, ENV_GLOBAL, paths->doc);
vars.set_one(FISH_BIN_DIR, ENV_GLOBAL, paths->bin);
wcstring scstr = paths->data;
scstr.append(L"/functions");
vars.set_one(L"fish_function_path", ENV_GLOBAL, scstr);
}
// Some `su`s keep $USER when changing to root.