bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bash-completion: don't complete filenames when they're not wanted

Browse source 
Filename completion should only be generated for makepkg, when using the
options -p or --config... which means we should offer option completions
by default.

Filename completion for pacman, should not be generated when using -Qu,
or -F without -o.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2018-09-07 11:58:52 -04:00 • committed by Allan McRae
parent ac959bb9c6
commit c887d2cf00
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/completion/bash_completion.in
View file

@ -71,10 +71,13 @@ _pacman_key() {
} }
_makepkg() { _makepkg() {
compopt +o default
local cur opts prev local cur opts prev
COMPREPLY=() COMPREPLY=()
_get_comp_words_by_ref cur prev _get_comp_words_by_ref cur prev
if [[ $cur = -* && ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vhp]) ]]; then if [[ $prev = @(-p|--config) ]]; then
compopt -o default
elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vh]) ]]; then
opts=('allsource asdeps check clean cleanbuild config force geninteg help opts=('allsource asdeps check clean cleanbuild config force geninteg help
holdver ignorearch install key log needed noarchive nobuild nocheck holdver ignorearch install key log needed noarchive nobuild nocheck
nocolor noconfirm nodeps noextract noprepare noprogressbar nosign nocolor noconfirm nodeps noextract noprepare noprogressbar nosign
@ -101,6 +104,7 @@ _pacman_repo_list() {
} }
_pacman() { _pacman() {
compopt -o default
local common core cur database files prev query remove sync upgrade o local common core cur database files prev query remove sync upgrade o
COMPREPLY=() COMPREPLY=()
_get_comp_words_by_ref cur prev _get_comp_words_by_ref cur prev
@ -131,12 +135,14 @@ _pacman() {
D|R) D|R)
_pacman_pkg Qq;; _pacman_pkg Qq;;
F) F)
_arch_incomp 'l list' && _pacman_pkg Slq { _arch_incomp 'l list' && _pacman_pkg Slq ; } ||
;; _arch_incomp 'o owns' ||
compopt +o default;;
Q) Q)
{ _arch_incomp 'g groups' && _pacman_pkg Qg sort; } || { _arch_incomp 'g groups' && _pacman_pkg Qg sort; } ||
{ _arch_incomp 'p file' && _pacman_file; } || { _arch_incomp 'p file' && _pacman_file; } ||
_arch_incomp 'o owns' || _arch_incomp 'u upgrades' || { _arch_incomp 'u upgrades' && compopt +o default; } ||
_arch_incomp 'o owns' ||
_pacman_pkg Qq;; _pacman_pkg Qq;;
S) S)
{ _arch_incomp 'g groups' && _pacman_pkg Sg; } || { _arch_incomp 'g groups' && _pacman_pkg Sg; } ||
@ -153,8 +159,8 @@ _pacman_file() {
compopt -o filenames; _filedir 'pkg.tar*' compopt -o filenames; _filedir 'pkg.tar*'
} }
complete -F _pacman -o default pacman complete -F _pacman pacman
complete -F _makepkg -o default makepkg complete -F _makepkg makepkg
complete -F _pacman_key -o default pacman-key complete -F _pacman_key -o default pacman-key
# ex:et ts=2 sw=2 ft=sh # ex:et ts=2 sw=2 ft=sh