mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-03-15 23:22:53 +08:00
Fix composer completions on Python 3
Some distros (Arch) use python command for Python 3, so we need to update the scripts to work with it. We cannot just switch to python3 command because MacOS does not ship it.
This commit is contained in:
parent
b89a6451a3
commit
9d1ccf8110
@ -22,18 +22,21 @@ end
|
||||
|
||||
function __fish_composer_required_packages
|
||||
test -f composer.json; or return
|
||||
set -l python (__fish_anypython); or return
|
||||
echo "
|
||||
import itertools
|
||||
import json
|
||||
json_data = open('composer.json')
|
||||
data = json.load(json_data)
|
||||
json_data.close()
|
||||
packages = data['require'].keys() + data['require-dev'].keys()
|
||||
print \"\n\".join(packages)
|
||||
" | python
|
||||
packages = itertools.chain(data['require'].keys(), data['require-dev'].keys())
|
||||
print(\"\n\".join(packages))
|
||||
" | $python
|
||||
end
|
||||
|
||||
function __fish_composer_installed_packages
|
||||
test -f composer.lock; or return
|
||||
set -l python (__fish_anypython); or return
|
||||
echo "
|
||||
import json
|
||||
json_data = open('composer.lock')
|
||||
@ -44,20 +47,21 @@ for package in data['packages']:
|
||||
installed_packages.append(package['name'])
|
||||
for package in data['packages-dev']:
|
||||
installed_packages.append(package['name'])
|
||||
print \"\n\".join(installed_packages)
|
||||
" | python
|
||||
print(\"\n\".join(installed_packages))
|
||||
" | $python
|
||||
end
|
||||
|
||||
function __fish_composer_scripts
|
||||
test -f composer.json; or return
|
||||
set -l python (__fish_anypython); or return
|
||||
echo "
|
||||
import json
|
||||
json_data = open('composer.json')
|
||||
data = json.load(json_data)
|
||||
json_data.close()
|
||||
if 'scripts' in data and data['scripts']:
|
||||
print \"\n\".join(data['scripts'].keys())
|
||||
" | python
|
||||
print(\"\n\".join(data['scripts'].keys()))
|
||||
" | $python
|
||||
end
|
||||
|
||||
# add cmds list
|
||||
|
Loading…
x
Reference in New Issue
Block a user