Merge branch 'maint'

1 files changed, 12 insertions, 5 deletions

diff --git a/contrib/bash_completion b/contrib/bash_completion
index 2713ba4d..1ec2cd53 100644
--- a/contrib/bash_completion
+++ b/contrib/bash_completion
@@ -52,10 +52,6 @@ _pacman_pkg() {
   )"
 }
 
-_pacman_file() {
-  compopt -o filenames; _filedir 'pkg.tar.*'
-}
-
 _pacman() {
   local common core cur database prev query remove sync upgrade o
   COMPREPLY=()
@@ -102,7 +98,18 @@ _pacman() {
   true
 }
 
+if [[ $(type -t compopt) = "builtin" ]]; then
+  _pacman_file() {
+    compopt -o filenames; _filedir 'pkg.tar.*'
+  }
+  complete -F _pacman -o default pacman
+else
+  _pacman_file() {
+    _filedir 'pkg.tar.*'
+  }
+  complete -F _pacman -o filenames -o default pacman
+fi
+
 complete -F _makepkg -o default makepkg
-complete -F _pacman  -o default pacman
 
 # ex:et ts=2 sw=2 ft=sh