[Bash-completion-commits] ./current r1188: Moved apache2ctl to a separate file.

[David Paleino]

------------------------------------------------------------
revno: 1188
committer: David Paleino <d.paleino at gmail.com>
branch nick: current
timestamp: Sat 2008-09-27 12:28:09 +0200
message:
  Moved apache2ctl to a separate file.
  Fixed broken bash_completion (sorry, forgot to switch comments!)
added:
  contrib/apache2ctl
modified:
  bash_completion
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion	2008-09-27 10:25:19 +0000
+++ b/bash_completion	2008-09-27 10:28:09 +0000
@@ -39,10 +39,10 @@
 
 # Alter the following to reflect the location of this file.
 #
-#[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
-#[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
-[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=$(pwd)/bash_completion
-[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=$(pwd)/contrib
+[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
+[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
+#[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=$(pwd)/bash_completion
+#[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=$(pwd)/contrib
 readonly BASH_COMPLETION BASH_COMPLETION_DIR
 
 # Set a couple of useful vars
@@ -9654,21 +9654,6 @@
 } &&
 complete -F _rrdtool rrdtool
 
-have apache2ctl && {
-_apache2ctl() {
-	local APWORDS
-	
-	COMPREPLY=()
-	cur=`_get_cword`
-	
-	APWORDS=$(apache2ctl 2>&1 >/dev/null | head -n1 | cut -f3 -d" " |\
-				tr "|" " ")
-	
-	COMPREPLY=( $( compgen -W "$APWORDS" -- "$cur" ) )
-}
-complete -F _apache2ctl apache2ctl
-}
-
 _filedir_xspec()
 {
 	local IFS cur xspec

=== added file 'contrib/apache2ctl'
--- a/contrib/apache2ctl	1970-01-01 00:00:00 +0000
+++ b/contrib/apache2ctl	2008-09-27 10:28:09 +0000
@@ -0,0 +1,15 @@
+# apache2ctl(1) completion
+#
+have apache2ctl && {
+_apache2ctl() {
+	local APWORDS
+	
+	COMPREPLY=()
+	cur=`_get_cword`
+	
+	APWORDS=$(apache2ctl 2>&1 >/dev/null | head -n1 | cut -f3 -d" " | tr "|" " ")
+	
+	COMPREPLY=( $( compgen -W "$APWORDS" -- "$cur" ) )
+}
+complete -F _apache2ctl apache2ctl
+}