Change setup to avoid invalid directories and warnings, also revert directory checking for fish_*_path, it makes sense to add non-empty directories to these

darcs-hash:20060421150558-ac50b-90aff08f81b3d280badba4cc14fb6a0897c39f9e.gz
This commit is contained in:
axel 2006-04-22 01:05:58 +10:00
parent de2405b35a
commit 508de57459
2 changed files with 3 additions and 5 deletions

View file

@ -274,8 +274,6 @@ static int is_path_variable( const wchar_t *env )
return contains_str( env, return contains_str( env,
L"PATH", L"PATH",
L"CDPATH", L"CDPATH",
L"fish_function_path",
L"fish_completion_path",
(void *)0 ); (void *)0 );
} }

View file

@ -18,7 +18,7 @@ if test "$USER" = root
end end
for i in $path_list for i in $path_list
if not expr "$PATH" : .\*$i.\* >/dev/null if not expr "$PATH" : "$i/*" >/dev/null
if test -d $i if test -d $i
set PATH $PATH $i set PATH $PATH $i
end end
@ -43,8 +43,8 @@ end
# Convenience functions # Convenience functions
# #
# The naming heuristic is that __fish_complete_* prints completions # The naming heuristic is that __fish_complete_* prints completions
# and descriptions, while __fish_print_* only prints the completion, # and descriptions, while __fish_print_* only prints the completions
# without the description # and no descriptions
# #
function __fish_complete_users -d "Print a list of local users, with the real user name as a description" function __fish_complete_users -d "Print a list of local users, with the real user name as a description"