[Bash-completion-commits] [SCM] bash-completion branch, master, updated. efaae3f8b958b14dd6fa5b7f07ea13375ddc3737

[Ville Skyttä]

The following commit has been merged in the master branch:
commit efaae3f8b958b14dd6fa5b7f07ea13375ddc3737
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Jun 9 23:10:51 2010 +0300

    Don't override command completions with init script ones.
    
    Need to be more careful with these now as some command completions may already
    be set up before contrib/service is sourced and we want them to survive.

diff --git a/contrib/service b/contrib/service
index 05732a9..1c48075 100644
--- a/contrib/service
+++ b/contrib/service
@@ -34,7 +34,8 @@ _service()
 } &&
 complete -F _service service
 [ -d /etc/init.d/ ] && complete -F _service -o default \
-    $(for i in /etc/init.d/*; do printf '%s\n' ${i##*/}; done)
+    $(for i in /etc/init.d/*; do
+    complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
 
 # Local variables:
 # mode: shell-script

-- 
bash-completion