Merge lp:~tribaal/ubuntu/saucy/juju-core/add-bash-completion into lp:ubuntu/saucy/juju-core

[Chris Glass]

This branch adds a rudimentary but functional autocomplete to all top-level juju commands.

For example, after installing a package build with this packaging branch, you can type "juju boo<tab>" and the bash_completion package will auto expand it to "juju bootstrap".

This is one of my first ubuntu packaging branches, so please feel free to let me know if I should have used another mechanism than dh_install to achieve this (but it seems like a rational approach).

[James Page (james-page)]

review: Approve

[James Page (james-page)]

I'll merge this with the 1.12 upload this week.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-23 08:51:44 +0000
+++ debian/changelog	2013-07-28 16:28:28 +0000
@@ -1,3 +1,10 @@
+juju-core (1.11.4-0ubuntu2) saucy; urgency=low
+
+  * Added d/etc/bash-completion.d/juju-core,and added a dh_install command
+    to the rules file to install the file.
+
+ -- Christopher Glass (Ubuntu) <[e-mail]>  Sun, 28 Jul 2013 18:19:15 +0200
+
 juju-core (1.11.4-0ubuntu1) saucy; urgency=low
 
   * New upstream release:

=== added directory 'debian/etc'
=== added directory 'debian/etc/bash_completion.d'
=== added file 'debian/etc/bash_completion.d/juju-core'
--- debian/etc/bash_completion.d/juju-core	1970-01-01 00:00:00 +0000
+++ debian/etc/bash_completion.d/juju-core	2013-07-28 16:28:28 +0000
@@ -0,0 +1,13 @@
+# juju-core completion
+
+_juju()
+{
+    local cur prev options files targets
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    actions=$(juju help commands | awk '{print $1}')
+    COMPREPLY=( $( compgen -W "${actions}" -- ${cur} ) )
+    return 0
+}
+complete -F _juju juju

=== modified file 'debian/rules'
--- debian/rules	2013-07-22 11:36:48 +0000
+++ debian/rules	2013-07-28 16:28:28 +0000
@@ -28,6 +28,7 @@
 	dh_install bin/juju usr/lib/juju-$(VERSION)/bin
 	dh_install bin/jujud usr/lib/juju-$(VERSION)/bin
 	dh_install juju.1 usr/lib/juju-$(VERSION)/man/man1
+	dh_install debian/etc/bash_completion.d/juju-core etc/bash_completion.d/
 	dh_auto_install
 
 override_dh_auto_clean: