it's curious but bash-completion is with - and not _

diff --git a/Makefile b/Makefile
index 119c1eeaa08fa2eaaf1e626a5b0860e299f0afd2..c97d6ffb005d9561dc2fede6f613d026d9c0924e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ README.txt: README.md
 youtube-dl.1: README.md
        pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md devscripts/bash_completion.template
-       python devscripts/bash_completion.py
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.template
+       python devscripts/bash-completion.py
 
 youtube-dl.tar.gz: all
        tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \

diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py
new file mode 100644 (file)
index 0000000..880db78
--- /dev/null
+++ b/devscripts/bash-completion.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import os
+from os.path import dirname as dirn
+import sys
+
+sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
+import youtube_dl
+
+BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
+BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.template"
+
+def build_completion(opt_parser):
+    opts_flag = []
+    for group in opt_parser.option_groups:
+        for option in group.option_list:
+            #for every long flag
+            opts_flag.append(option.get_opt_string())
+    with open(BASH_COMPLETION_TEMPLATE) as f:
+        template = f.read()
+    with open(BASH_COMPLETION_FILE, "w") as f:
+        #just using the special char
+        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
+        f.write(filled_template)
+
+parser = youtube_dl.parseOpts()[0]
+build_completion(parser)

diff --git a/devscripts/bash-completion.template b/devscripts/bash-completion.template
new file mode 100644 (file)
index 0000000..3b99a96
--- /dev/null
+++ b/devscripts/bash-completion.template
@@ -0,0 +1,14 @@
+__youtube-dl()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    opts="{{flags}}"
+
+    if [[ ${cur} == * ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+}
+
+complete -F __youtube-dl youtube-dl

diff --git a/devscripts/bash_completion.py b/devscripts/bash_completion.py
deleted file mode 100644 (file)
index 704034f..0000000
--- a/devscripts/bash_completion.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-import os
-from os.path import dirname as dirn
-import sys
-
-sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
-import youtube_dl
-
-BASH_COMPLETION_FILE = "youtube-dl.bash_completion"
-BASH_COMPLETION_TEMPLATE = "devscripts/bash_completion.template"
-
-def build_completion(opt_parser):
-    opts_flag = []
-    for group in opt_parser.option_groups:
-        for option in group.option_list:
-            #for every long flag
-            opts_flag.append(option.get_opt_string())
-    with open(BASH_COMPLETION_TEMPLATE) as f:
-        template = f.read()
-    with open(BASH_COMPLETION_FILE, "w") as f:
-        #just using the special char
-        filled_template = template.replace("{{flags}}", " ".join(opts_flag))
-        f.write(filled_template)
-
-parser = youtube_dl.parseOpts()[0]
-build_completion(parser)

diff --git a/devscripts/bash_completion.template b/devscripts/bash_completion.template
deleted file mode 100644 (file)
index 3b99a96..0000000
--- a/devscripts/bash_completion.template
+++ /dev/null
@@ -1,14 +0,0 @@
-__youtube-dl()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    opts="{{flags}}"
-
-    if [[ ${cur} == * ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-}
-
-complete -F __youtube-dl youtube-dl