Merge tag 'upstream/2014.07.11'

[youtubedl] / devscripts / bash-completion.in

diff --git a/devscripts/bash-completion.in b/devscripts/bash-completion.in
index bd10f63c2f2615168a482085ad156a9f4e330ddd..28bd237278da5c0ade9ed96a4cb722c1b6973cf3 100644 (file)
--- a/devscripts/bash-completion.in
+++ b/devscripts/bash-completion.in
@@ -1,10 +1,21 @@
-__youtube-dl()
+__youtube_dl()

 {
 {

-    local cur prev opts
+    local cur prev opts fileopts diropts keywords

     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"

+    prev="${COMP_WORDS[COMP_CWORD-1]}"

     opts="{{flags}}"
     opts="{{flags}}"

-    keywords=":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater"
+    keywords=":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
+    fileopts="-a|--batch-file|--download-archive|--cookies|--load-info"
+    diropts="--cache-dir"
+
+    if [[ ${prev} =~ ${fileopts} ]]; then
+        COMPREPLY=( $(compgen -f -- ${cur}) )
+        return 0
+    elif [[ ${prev} =~ ${diropts} ]]; then
+        COMPREPLY=( $(compgen -d -- ${cur}) )
+        return 0
+    fi

 
     if [[ ${cur} =~ : ]]; then
         COMPREPLY=( $(compgen -W "${keywords}" -- ${cur}) )
 
     if [[ ${cur} =~ : ]]; then
         COMPREPLY=( $(compgen -W "${keywords}" -- ${cur}) )


@@ -15,4 +26,4 @@ __youtube-dl()
     fi
 }
 
     fi
 }
 

-complete -F __youtube-dl youtube-dl
+complete -F __youtube_dl youtube-dl