[devscripts] 01/08: Fixed issues with current bash completion (Closes: #804492)

Nicholas Bamber periapt at moszumanska.debian.org
Sat Nov 14 08:11:06 UTC 2015 

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit f39da9f68460947d05ee9872ae5d71107819cf0a
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Wed Nov 11 00:20:36 2015 +0000

    Fixed issues with current bash completion (Closes: #804492)
    
    * Fixed issues with current bash completion (Closes: #804492)
      - Reorganised scripts/Makefile so that bash completion scripts
        are installed matching their command names - exception the
        generic pkgnames.bash_completion .
      - Where necessary added links to bash completion scripts
        to debian/links to reuse bash completion code
      - Removed deprecated "have" mechanism from bash completion scripts.
      - Removed undefined "$filenames" from chdist.bash_completion
      - Split debi.bash_completion off from pkgnames.bash_completion
        and added links for both debi/debc and corrected complete commands
---
 debian/changelog                  | 13 +++++++++++++
 debian/links                      | 21 +++++++++++++++++++++
 scripts/Makefile                  | 15 +++++++++------
 scripts/chdist.bash_completion    |  3 +--
 scripts/dcut.bash_completion      |  3 +--
 scripts/debchange.bash_completion |  5 ++---
 scripts/debi.bash_completion      | 12 ++++++++++++
 scripts/debsign.bash_completion   |  3 +--
 scripts/pkgnames.bash_completion  | 13 +------------
 scripts/uupdate.bash_completion   |  3 +--
 10 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe5839e..cff2cf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
 devscripts (2.15.10) UNRELEASED; urgency=medium
 
+  [ Benjamin Drung ]
   * test_uscan: Fix failure in testFileExclusion due to wrong tarfile name
     test on Ubuntu.
 
+  [ Nicholas Bamber ]
+  * Fixed issues with current bash completion (Closes: #804492)
+    - Reorganised scripts/Makefile so that bash completion scripts
+      are installed matching their command names - exception the
+      generic pkgnames.bash_completion .
+    - Where necessary added links to bash completion scripts
+      to debian/links to reuse bash completion code
+    - Removed deprecated "have" mechanism from bash completion scripts.
+    - Removed undefined "$filenames" from chdist.bash_completion
+    - Split debi.bash_completion off from pkgnames.bash_completion
+      and added links for both debi/debc and corrected complete commands
+
  -- Benjamin Drung <bdrung at debian.org>  Fri, 23 Oct 2015 23:54:58 +0200
 
 devscripts (2.15.9) unstable; urgency=medium
diff --git a/debian/links b/debian/links
index 0892480..4ade7c4 100644
--- a/debian/links
+++ b/debian/links
@@ -11,3 +11,24 @@
 /usr/share/man/fr/man1/debchange.1.gz		/usr/share/man/fr/man1/dch.1.gz
 /usr/share/man/fr/man1/pts-subscribe.1.gz	/usr/share/man/fr/man1/pts-unsubscribe.1.gz
 /usr/share/man/fr/man1/edit-patch.1.gz		/usr/share/man/fr/man1/add-patch.1.gz
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/wnpp-alert
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/wnpp-check
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/mk-build-deps
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/rmadison
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/mass-bug
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/debsnap
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/dd-list
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/build-rdeps
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/who-uploads
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/transition-check
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/getbuildlog
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/dcontrol
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/grep-excuses
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/rc-alert
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/bts
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/whodepends
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/dget
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/pts-subscribe
+/usr/share/bash-completion/completions/pkgnames  /usr/share/bash-completion/completions/pts-unsubscribe
+/usr/share/bash-completion/completions/debchange /usr/share/bash-completion/completions/dch
+/usr/share/bash-completion/completions/debi /usr/share/bash-completion/completions/debc
diff --git a/scripts/Makefile b/scripts/Makefile
index 797c78f..9d4a3e2 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -19,7 +19,8 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 CWRAPPERS = debpkg-wrapper
 SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst %.sh,%,$(SH_FILES))
 COMPL_FILES := $(wildcard *.bash_completion)
-COMPLETION = $(patsubst %.bash_completion,devscripts.%,$(COMPL_FILES))
+BC_BUILD_DIR:=bash_completion
+COMPLETION = $(patsubst %.bash_completion,$(BC_BUILD_DIR)/%,$(COMPL_FILES))
 COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion)
 
 GEN_MAN1S += devscripts.1 mk-origtargz.1
@@ -70,17 +71,19 @@ devscripts.1: devscripts.1.in
 	perl ../debian/genmanpage.pl >> $@.$(PID)
 	mv $@.$(PID) $@
 
-devscripts.%: %.bash_completion
+$(BC_BUILD_DIR):
+	mkdir $(BC_BUILD_DIR)
+
+$(COMPLETION): $(BC_BUILD_DIR)/% : %.bash_completion $(BC_BUILD_DIR)
 	cp $< $@
 
 clean:
 	python3 setup.py clean -a
 	find -name '*.pyc' -delete
 	find -name __pycache__ -delete
-	rm -rf devscripts.egg-info
+	rm -rf devscripts.egg-info $(BC_BUILD_DIR)
 	rm -f $(SCRIPTS) $(patsubst %,%.tmp,$(SCRIPTS)) \
-		$(GEN_MAN1S) $(SCRIPT_LIBS) $(CWRAPPERS) \
-		$(COMPLETION)
+		$(GEN_MAN1S) $(SCRIPT_LIBS) $(CWRAPPERS)
 
 test:
 	$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
@@ -90,7 +93,7 @@ install: all
 	cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
 	ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
 	install -d $(DESTDIR)$(COMPL_DIR)
-	cp $(COMPLETION) $(DESTDIR)$(COMPL_DIR)
+	cp $(BC_BUILD_DIR)/* $(DESTDIR)$(COMPL_DIR)/
 	# Special treatment for debpkg
 	install -d $(DESTDIR)$(DATA_DIR)
 	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(DATA_DIR)
diff --git a/scripts/chdist.bash_completion b/scripts/chdist.bash_completion
index 53b0fc2..f6fc251 100644
--- a/scripts/chdist.bash_completion
+++ b/scripts/chdist.bash_completion
@@ -1,4 +1,3 @@
-have chdist &&
 _chdist ()
 {
   local cur=$2 prev=$3
@@ -47,6 +46,6 @@ _chdist ()
 }
 
 
-[ -n "${have:-}" ] && complete -F _chdist $filenames chdist
+complete -F _chdist chdist
 
 
diff --git a/scripts/dcut.bash_completion b/scripts/dcut.bash_completion
index 4a1a6bd..96d6998 100644
--- a/scripts/dcut.bash_completion
+++ b/scripts/dcut.bash_completion
@@ -1,4 +1,3 @@
-have dcut &&
 _dcut()
 {
     local cur prev options commands
@@ -43,4 +42,4 @@ _dcut()
     return 0
 
 }
-[ "$have" ] && complete -F _dcut -o filenames dcut
+complete -F _dcut -o filenames dcut
diff --git a/scripts/debchange.bash_completion b/scripts/debchange.bash_completion
index 2fa1c66..b076684 100644
--- a/scripts/debchange.bash_completion
+++ b/scripts/debchange.bash_completion
@@ -1,4 +1,3 @@
-have debchange &&
 _debchange()
 {
     local cur prev options
@@ -76,5 +75,5 @@ _debchange()
     return 0
 
 }
-[ "$have" ] && complete -F _debchange debchange
-[ "$have" ] && complete -F _debchange dch
+complete -F _debchange debchange
+complete -F _debchange dch
diff --git a/scripts/debi.bash_completion b/scripts/debi.bash_completion
new file mode 100644
index 0000000..5f89826
--- /dev/null
+++ b/scripts/debi.bash_completion
@@ -0,0 +1,12 @@
+_debc()
+{
+    local cur
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    COMPREPLY=($(compgen -f -X '!*.changes' -- "$cur"))
+    if echo "$cur" | grep -qs '^[a-z0-9+.-]*$'; then
+        COMPREPLY=(${COMPREPLY[@]} $(apt-cache pkgnames -- $cur 2> /dev/null))
+    fi
+    return 0
+}
+complete -o dirnames -F _debc debc
+complete -o dirnames -F _debc debi
diff --git a/scripts/debsign.bash_completion b/scripts/debsign.bash_completion
index 825c60a..f405b06 100644
--- a/scripts/debsign.bash_completion
+++ b/scripts/debsign.bash_completion
@@ -1,4 +1,3 @@
-have debsign &&
 _debsign()
 {
     local cur prev options
@@ -27,4 +26,4 @@ _debsign()
     return 0
 
 }
-[ "$have" ] && complete -F _debsign -o filenames debsign
+complete -F _debsign -o filenames debsign
diff --git a/scripts/pkgnames.bash_completion b/scripts/pkgnames.bash_completion
index 2b02bfb..4f6cc93 100644
--- a/scripts/pkgnames.bash_completion
+++ b/scripts/pkgnames.bash_completion
@@ -9,15 +9,4 @@ _pkg_names()
     return 0
 }
 
-_debc()
-{
-    local cur
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    COMPREPLY=($(compgen -f -X '!*.changes' -- "$cur"))
-    if echo "$cur" | grep -qs '^[a-z0-9+.-]*$'; then
-        COMPREPLY=(${COMPREPLY[@]} $(apt-cache pkgnames -- $cur 2> /dev/null))
-    fi
-    return 0
-}
-complete -F _pkg_names wnpp-alert wnpp-check mk-build-deps rmadison mass-bug debsnap dd-list build-rdeps who-uploads transition-check getbuildlog dcontrol grep-excuses rc-alert bts whodepends dget pts-subscribe debc pts-unsubscribe
-complete -o dirnames -F _debc debc
+complete -F _pkg_names wnpp-alert wnpp-check mk-build-deps rmadison mass-bug debsnap dd-list build-rdeps who-uploads transition-check getbuildlog dcontrol grep-excuses rc-alert bts whodepends dget pts-subscribe pts-unsubscribe
diff --git a/scripts/uupdate.bash_completion b/scripts/uupdate.bash_completion
index e956a08..88e6d21 100644
--- a/scripts/uupdate.bash_completion
+++ b/scripts/uupdate.bash_completion
@@ -1,4 +1,3 @@
-have uupdate &&
 _uupdate()
 {
     local cur prev options
@@ -29,4 +28,4 @@ _uupdate()
     return 0
 
 }
-[ "$have" ] && complete -F _uupdate -o filenames uupdate
+complete -F _uupdate -o filenames uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git

More information about the devscripts-devel mailing list