mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-25 09:39:52 +08:00
Fix cleanup of autogenerated completions
We were inconsistent about this for no apparent reason. Also cleaning up in ~/.config/fish/completions is irrelevant by now since we moved to ~/.local/share/fish 8 years ago. Now that the parent commit moved it again, cleaning up that one seems reasonable.
This commit is contained in:
parent
62a8b48fd1
commit
67197b4b07
|
@ -96,7 +96,7 @@ end" >$__fish_config_dir/config.fish
|
||||||
# We don't want to call `fish -c` since that is unnecessary and sources config.fish again.
|
# We don't want to call `fish -c` since that is unnecessary and sources config.fish again.
|
||||||
# Hence we'll call python directly.
|
# Hence we'll call python directly.
|
||||||
# c_m_p.py should work with any python version.
|
# c_m_p.py should work with any python version.
|
||||||
set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in ~/.config/fish/completions --cleanup-in $__fish_config_dir/generated_completions --cleanup-in $__fish_cache_dir/generated_completions
|
set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in $__fish_user_data_dir/generated_completions --cleanup-in $__fish_cache_dir/generated_completions
|
||||||
if set -l python (__fish_anypython)
|
if set -l python (__fish_anypython)
|
||||||
# Run python directly in the background and swallow all output
|
# Run python directly in the background and swallow all output
|
||||||
$python $update_args >/dev/null 2>&1 &
|
$python $update_args >/dev/null 2>&1 &
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
function fish_update_completions --description "Update man-page based completions"
|
function fish_update_completions --description "Update man-page based completions"
|
||||||
# Don't write .pyc files, use the manpath, clean up old completions
|
# Don't write .pyc files, use the manpath, clean up old completions
|
||||||
# display progress.
|
# display progress.
|
||||||
set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in $__fish_cache_dir/generated_completions --progress $argv
|
set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in $__fish_user_data_dir/generated_completions --cleanup-in $__fish_cache_dir/generated_completions --progress $argv
|
||||||
if set -l python (__fish_anypython)
|
if set -l python (__fish_anypython)
|
||||||
$python $update_args
|
$python $update_args
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue
Block a user