[Bash-completion-commits] ./current r1192: Fixed errors with POSIX enabled (Closes: #502804)

[David Paleino]

------------------------------------------------------------
revno: 1192
committer: David Paleino <d.paleino at gmail.com>
branch nick: current
timestamp: Fri 2008-10-24 19:17:23 +0200
message:
  Fixed errors with POSIX enabled (Closes: #502804)
modified:
  bash_completion
  debian/changelog
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion	2008-10-24 17:10:46 +0000
+++ b/bash_completion	2008-10-24 17:17:23 +0000
@@ -269,16 +269,23 @@
 
 	_expand || return 0
 
-	local toks=( ) tmp
-	while read -r tmp; do
-		[[ -n $tmp ]] && toks[${#toks[@]}]=$tmp
-	done < <( compgen -d -- "$(quote_readline "$cur")" )
+	toks=( ${toks[@]} $(
+		compgen -d -- "$(quote_readline "$cur")" | {
+			while read -r tmp; do
+				[[ -n $tmp ]] && echo $tmp
+			done
+		}
+	))
 	
 	if [[ "$1" != -d ]]; then
 		xspec=${1:+"!*.$1"}
-		while read -r tmp; do
-			[[ -n $tmp ]] && toks[${#toks[@]}]=$tmp
-		done < <( compgen -f -X "$xspec" -- "$(quote_readline "$cur")" )
+		toks=( ${toks[@]} $(
+			compgen -f -X "$xspec" -- "$(quote_readline "$cur")" | {
+				while read -r tmp; do
+					[[ -n $tmp ]] && echo $tmp
+				done
+			}
+		))
 	fi
 
 	COMPREPLY=( "${COMPREPLY[@]}" "${toks[@]}" )
@@ -9570,15 +9577,21 @@
 	xspec=${xspec#*-X }
 	xspec=${xspec%% *}
 
-	local toks=( ) tmp
+	toks=( $(
+		compgen -d -- "$(quote_readline "$cur")" | {
+			while read -r tmp; do
+				[[ -n $tmp ]] && echo $tmp
+			done
+		}
+	))
 	
-	while read -r tmp; do
-		[[ -n $tmp ]] && toks[${#toks[@]}]=$tmp
-	done < <( compgen -d -- "$(quote_readline "$cur")" )
-
-	while read -r tmp; do
-		[[ -n $tmp ]] && toks[${#toks[@]}]=$tmp
-	done < <( eval compgen -f -X $xspec -- "\$(quote_readline "\$cur")" )	
+	toks=( ${toks[@]} $(
+		eval compgen -f -X $xspec -- "\$(quote_readline "\$cur")" | {
+			while read -r tmp; do
+				[[ -n $tmp ]] && echo $tmp
+			done
+		}
+	))
 	
 	COMPREPLY=( "${toks[@]}" )
 }

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-10-24 17:10:46 +0000
+++ b/debian/changelog	2008-10-24 17:17:23 +0000
@@ -29,9 +29,10 @@
   * Added apache2ctl completion
   * Added gpg2 completion (Closes: #489927)
   * Fixed mplayer -skin completion (Closes: #501473)
+  * Fixed errors with POSIX enabled (Closes: #502804)
   * debian/links fixed (Closes: #494292)
 
- -- David Paleino <d.paleino at gmail.com>  Fri, 24 Oct 2008 19:07:34 +0200
+ -- David Paleino <d.paleino at gmail.com>  Fri, 24 Oct 2008 19:16:44 +0200
 
 bash-completion (20080705) unstable; urgency=low