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

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit c885f984555f06f1c9c69752b1a8bc74ce0be777
Author: Guillaume Rousse <guillomovitch at zarb.org>
Date:   Wed May 27 18:31:19 2009 +0200

    split wvdial completion

diff --git a/Makefile.am b/Makefile.am
index 4983b99..e5eb1f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,6 +92,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/unrar \
 		contrib/vncviewer \
 		contrib/wodim \
+		contrib/wvdial \
 		contrib/xhost \
 		contrib/xm \
 		contrib/xmllint \
diff --git a/bash_completion b/bash_completion
index 2bb1e3e..8557667 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4462,53 +4462,6 @@ _dcop()
 } &&
 complete -F _dcop dcop
 
-# wvdial(1) completion
-#
-have wvdial &&
-_wvdial()
-{
-	local cur prev config i IFS=$'\t\n'
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	case $prev in
-		--config)
-			_filedir
-			return 0
-			;;
-	esac
-
-	case $cur in
-		-*)
-			COMPREPLY=( $( compgen -W '--config --chat \
-				--remotename --help --version --no-syslog' \
-				-- $cur ) )
-			;;
-		*)
-			# start with global and personal config files
-		       	config="/etc/wvdial.conf"$'\t'"$HOME/.wvdialrc"
-			# replace with command line config file if present
-			for (( i=1; i < COMP_CWORD; i++ )); do
-				if [[ "${COMP_WORDS[i]}" == "--config" ]]; then
-					config=${COMP_WORDS[i+1]}
-					break
-				fi
-			done
-			# parse config files for sections and
-			# remove default section
-			COMPREPLY=( $( sed -ne \
-				    "s|^\[Dialer \($cur.*\)\]$|\1|p" \
-				    $config 2>/dev/null |grep -v '^Defaults$'))
-			# escape spaces
-			COMPREPLY=${COMPREPLY// /\\ }
-			;;
-	esac
-
-} &&
-complete -F _wvdial wvdial
-
 # gpg(1) completion
 #
 have gpg &&
diff --git a/contrib/wvdial b/contrib/wvdial
new file mode 100644
index 0000000..e5c1f78
--- /dev/null
+++ b/contrib/wvdial
@@ -0,0 +1,49 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for wvdial
+
+have wvdial &&
+_wvdial()
+{
+	local cur prev config i IFS=$'\t\n'
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case $prev in
+		--config)
+			_filedir
+			return 0
+			;;
+	esac
+
+	case $cur in
+		-*)
+			COMPREPLY=( $( compgen -W '--config --chat \
+				--remotename --help --version --no-syslog' \
+				-- $cur ) )
+			;;
+		*)
+			# start with global and personal config files
+		       	config="/etc/wvdial.conf"$'\t'"$HOME/.wvdialrc"
+			# replace with command line config file if present
+			for (( i=1; i < COMP_CWORD; i++ )); do
+				if [[ "${COMP_WORDS[i]}" == "--config" ]]; then
+					config=${COMP_WORDS[i+1]}
+					break
+				fi
+			done
+			# parse config files for sections and
+			# remove default section
+			COMPREPLY=( $( sed -ne \
+				    "s|^\[Dialer \($cur.*\)\]$|\1|p" \
+				    $config 2>/dev/null |grep -v '^Defaults$'))
+			# escape spaces
+			COMPREPLY=${COMPREPLY// /\\ }
+			;;
+	esac
+
+} &&
+complete -F _wvdial wvdial

-- 
bash-completion