summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-01-08 19:14:04 +0100
committerDan McGee <dan@archlinux.org>2012-01-08 19:14:04 +0100
commit4f02b98338437b9395addb29000893b91d1ae21e (patch)
tree986568d1e64bea1bde6ff287ed5a2629e7f8136f /contrib
parent7f51ba99ae6db204d69ce271cd5cc4e959135738 (diff)
parent73d0d743bda5367fcab2453bbe21c15e481150c2 (diff)
downloadpacman-4f02b98338437b9395addb29000893b91d1ae21e.tar.gz
pacman-4f02b98338437b9395addb29000893b91d1ae21e.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/signing.c Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/bash_completion.in4
-rw-r--r--contrib/zsh_completion.in8
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in
index eb31b5e5..d9f8d826 100644
--- a/contrib/bash_completion.in
+++ b/contrib/bash_completion.in
@@ -113,12 +113,12 @@ _pacman() {
if [[ $(type -t compopt) = "builtin" ]]; then
_pacman_file() {
- compopt -o filenames; _filedir 'pkg.tar.*'
+ compopt -o filenames; _filedir 'pkg.tar*'
}
complete -F _pacman -o default pacman
else
_pacman_file() {
- _filedir 'pkg.tar.*'
+ _filedir 'pkg.tar*'
}
complete -F _pacman -o filenames -o default pacman
fi
diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
index 71ef901b..f3130867 100644
--- a/contrib/zsh_completion.in
+++ b/contrib/zsh_completion.in
@@ -36,7 +36,7 @@ _pacman_opts_pkgfile=(
'--force[Overwrite conflicting files]'
'--needed[Do not reinstall up to date packages]'
'--recursive[Reinstall all dependencies of target packages]'
- '*:package file:_files -g "*.pkg.tar.*(.)"'
+ '*:package file:_files -g "*.pkg.tar*(.)"'
)
# options for passing to _arguments: subactions for --query command
@@ -127,7 +127,7 @@ _pacman_action_query() {
_arguments -s : \
"$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \
- '*:package file:_files -g "*.pkg.tar.*"'
+ '*:package file:_files -g "*.pkg.tar*"'
;;
query_group)
_arguments -s : \
@@ -300,11 +300,11 @@ _pacman() {
"$_pacman_opts_query_modifiers[@]" \
'*:package file:_files'
;;
- -Q*p*) # file *.pkg.tar.*
+ -Q*p*) # file *.pkg.tar*
_arguments -s : \
"$_pacman_opts_common[@]" \
"$_pacman_opts_query_modifiers[@]" \
- '*:package file:_files -g "*.pkg.tar.*"'
+ '*:package file:_files -g "*.pkg.tar*"'
;;
-Q*) _pacman_action_query ;;
-R*) _pacman_action_remove ;;