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

Merge branch 'master' into major

Browse source
This commit is contained in:
Kurtis Rader 2017-08-06 20:22:31 -07:00
commit fb7645659f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/builtin_set.cpp
View file

@ -65,6 +65,8 @@ static const struct woption long_options[] = {
#define BUILTIN_SET_MISMATCHED_ARGS _(L"%ls: You provided %d indexes but %d values\n") #define BUILTIN_SET_MISMATCHED_ARGS _(L"%ls: You provided %d indexes but %d values\n")
#define BUILTIN_SET_ERASE_NO_VAR _(L"%ls: Erase needs a variable name\n") #define BUILTIN_SET_ERASE_NO_VAR _(L"%ls: Erase needs a variable name\n")
#define BUILTIN_SET_ARRAY_BOUNDS_ERR _(L"%ls: Array index out of bounds\n") #define BUILTIN_SET_ARRAY_BOUNDS_ERR _(L"%ls: Array index out of bounds\n")
#define BUILTIN_SET_UVAR_ERR \
_(L"%ls: Universal var '%ls' created but shadowed by global var of the same name.\n")
// Test if the specified variable should be subject to path validation. // Test if the specified variable should be subject to path validation.
static const wcstring_list_t path_variables({L"PATH", L"CDPATH"}); static const wcstring_list_t path_variables({L"PATH", L"CDPATH"});
@ -213,10 +215,8 @@ static int check_global_scope_exists(const wchar_t *cmd, set_cmd_opts_t &opts, c
io_streams_t &streams) { io_streams_t &streams) {
if (opts.universal) { if (opts.universal) {
env_var_t global_dest = env_get(dest, ENV_GLOBAL); env_var_t global_dest = env_get(dest, ENV_GLOBAL);
if (!global_dest.missing()) { if (!global_dest.missing() && shell_is_interactive()) {
streams.err.append_format( streams.err.append_format(BUILTIN_SET_UVAR_ERR, cmd, dest);
_(L"%ls: Warning: universal scope selected, but a global variable '%ls' exists.\n"),
cmd, dest);
} }
} }