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

__fish_config_interactive: Prefer python3

Browse source 
Also includes the CHANGELOG.
This commit is contained in:
Fabian Homborg 2017-04-20 13:40:45 +02:00
parent e410d47565
commit 805a177673
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@
- Command substitutions now have access to the terminal, allowing tools like `fzf` to work in them (#1362, #3922). - Command substitutions now have access to the terminal, allowing tools like `fzf` to work in them (#1362, #3922).
- `bg`s argument parsing has been reworked. It now fails for invalid arguments but allows non-existent jobs (#3909). - `bg`s argument parsing has been reworked. It now fails for invalid arguments but allows non-existent jobs (#3909).
- fish will now reset $USER if the uid is 0. This is to workaround some su implementations that pass along $USER when switching to root (#3944). - fish will now reset $USER if the uid is 0. This is to workaround some su implementations that pass along $USER when switching to root (#3944).
- Our python-using functions now pick any python version (preferring python3), making dependencies on a specific python version unnecessary (#3970).
--- ---

8
share/functions/__fish_config_interactive.fish
View file

@ -122,12 +122,12 @@ function __fish_config_interactive -d "Initializations that should be performed
# 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_datadir/tools/create_manpage_completions.py --manpath --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions' set -l update_args -B $__fish_datadir/tools/create_manpage_completions.py --manpath --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions'
if command -qs python if command -qs python3
python $update_args >/dev/null ^/dev/null & python3 $update_args >/dev/null ^/dev/null &
else if command -qs python2 else if command -qs python2
python2 $update_args >/dev/null ^/dev/null & python2 $update_args >/dev/null ^/dev/null &
else if command -qs python3 else if command -qs python
python3 $update_args >/dev/null ^/dev/null & python $update_args >/dev/null ^/dev/null &
end end
end end
end end