packages: bash-completion/builder.bash-completion - save something

[glen]

Author: glen                         Date: Tue Oct 19 19:56:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- save something

---- Files affected:
packages/bash-completion:
   builder.bash-completion (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/bash-completion/builder.bash-completion
diff -u packages/bash-completion/builder.bash-completion:1.1 packages/bash-completion/builder.bash-completion:1.2
--- packages/bash-completion/builder.bash-completion:1.1	Fri Feb 19 13:00:17 2010
+++ packages/bash-completion/builder.bash-completion	Tue Oct 19 21:56:30 2010
@@ -1,37 +1,43 @@
 # builder(1) completion
-#
+
 _builder()
 {
 	local cur prev first
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-	if [ $COMP_CWORD -eq 1 ]; then
-		# first parameter on line
-		case "$cur" in
-		*)
-
-			COMPREPLY=( $( compgen -W '
-				-5 -a5 -n5 -D -V -a -b -ba -bb -bp -bc -bi -bl -bs -B -c -cf -d -g
-				-h -l -m -nc -ncs -nd -nm -nu -ns -ns0 -nn -ske -q -r -A -R -RB
-				-FRB -sd -sdp -sf -sp -su -T -Tvs -Ts -Tv -Tp -tt -ir -v -u -un
-				-U -Upi -np
-			' -- $cur ) )
+	case "$prev" in
+		-@(g|--get))
+			_filedir
+			return 0
 			;;
-		esac
+		--with|--without)
+			./builder --show-avail-bconds automake.spec
+			return 0
+			;;
+	esac
 
-	return 0
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '
+			-5 -a5 -n5 -D -V -a -b -ba -bb -bp -bc -bi -bl -bs -B -c -cf -d -g
+			-h -l -m -nc -ncs -nd -nm -nu -ns -ns0 -nn -ske -q -r -A -R -RB
+			-FRB -sd -sdp -sf -sp -su -T -Tvs -Ts -Tv -Tp -tt -ir -v -u -un
+			-U -Upi -np
+			--with --without
+		' -- $cur ) )
+	else
+		# find which specfile to use
+		specfile=
+		for (( i=1; i < COMP_CWORD; i++ )); do
+			if [[ "${COMP_WORDS[i]}" == -@(?(build)file|f) ]]; then
+				specfile=${COMP_WORDS[i+1]}
+				break
+			fi
+		done
+		[ ! -f $specfile ] && return 0
 	fi
-
-	first=${COMP_WORDS[1]}
-
-	case "$first" in
-	-@(g|--get))
-		_filedir
-		;;
-	esac
 
 	return 0
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/builder.bash-completion?r1=1.1&r2=1.2&f=u