[Bash-completion-commits] ./current r1097: - add more completions to aptitude (Closes: #432289)

David Paleino d.paleino at gmail.com
Sat May 10 16:04:06 UTC 2008


------------------------------------------------------------
revno: 1097
committer: David Paleino <d.paleino at gmail.com>
branch nick: bash-completion
timestamp: Sat 2008-05-10 18:04:06 +0200
message:
    - add more completions to aptitude (Closes: #432289)
    - fixed UTF-8 problem with _get_cword(), thanks to
      Andrei Paskevich (Closes: #472132)
    - fixed autoremove completion, thanks to Flavio Visentin
      (Closes: #474974)
    - cmf and CMF added to playmidi completion (Closes: #365658)
    - added rrdtool completion, thanks to Justin Pryzby (Closes: #428641)
    - added OpenDocument completion for unzip/zipinfo (.od{f,g,p,s,t})
      (Closes: #472940)
removed:
  TEST
modified:
  bash_completion
  contrib/bitkeeper
  contrib/bittorrent
  contrib/cksfv
  contrib/clisp
  contrib/dsniff
  contrib/freeciv
  contrib/gcl
  contrib/gkrellm
  contrib/gnatmake
  contrib/isql
  contrib/larch
  contrib/lisp
  contrib/mailman
  contrib/mcrypt
  contrib/modules
  contrib/mtx
  contrib/p4
  contrib/povray
  contrib/ri
  contrib/sbcl
  contrib/sitecopy
  contrib/snownews
  contrib/svk
  contrib/unace
  contrib/unrar
  debian/changelog
-------------- next part --------------
=== removed file 'TEST'
--- a/TEST	2008-05-03 08:30:28 +0000
+++ b/TEST	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Still trying to test CIA.vc

=== modified file 'bash_completion'
--- a/bash_completion	2008-05-06 19:37:03 +0000
+++ b/bash_completion	2008-05-10 16:04:06 +0000
@@ -81,7 +81,7 @@
 #
 # START exclude -- do NOT remove this line
 complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep
-complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw|ott)' unzip zipinfo
+complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw|ott|od[fgpst])' unzip zipinfo
 complete -f -X '*.Z' compress znew
 complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcmp zdiff zcat zegrep zfgrep zgrep zless zmore
 complete -f -X '!*.Z' uncompress
@@ -105,7 +105,7 @@
 complete -f -X '!*.@(ogg|OGG|m3u|flac|spx)' ogg123
 complete -f -X '!*.@(mp3|MP3|ogg|OGG|pls|m3u)' gqmpeg freeamp
 complete -f -X '!*.fig' xfig
-complete -f -X '!*.@(mid?(i)|MID?(I))' playmidi
+complete -f -X '!*.@(mid?(i)|MID?(I)|cmf|CMF)' playmidi
 complete -f -X '!*.@(mid?(i)|MID?(I)|rmi|RMI|rcp|RCP|[gr]36|[GR]36|g18|G18|mod|MOD|xm|XM|it|IT|x3m|X3M)' timidity
 complete -f -X '*.@(o|so|so.!(conf)|a|t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview
 complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs
@@ -197,6 +197,7 @@
 _get_cword()
 {
 	local i
+	local LC_CTYPE=C
 	local WORDBREAKS=${COMP_WORDBREAKS}
 	if [ -n $1 ]; then
 		for (( i=0; i<${#1}; ++i )); do
@@ -690,7 +691,8 @@
 # that instead.
 #
 _mount()
-{       local cur i sm host
+{
+	local cur i sm host
 
 	COMPREPLY=()
 	cur=`_get_cword`
@@ -2068,14 +2070,14 @@
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
-		if [[ ${COMP_WORDS[i]} == @(install|remove|purge|source|build-dep) ]]; then
+		if [[ ${COMP_WORDS[i]} == @(install|remove|autoremove|purge|source|build-dep) ]]; then
 			special=${COMP_WORDS[i]}
 		fi
 	done
 
 	if [ -n "$special" ]; then
 		case $special in
-		remove|purge)
+		remove|autoremove|purge)
 			if [ -f /etc/debian_version ]; then
 				# Debian system
 				COMPREPLY=( $( _comp_dpkg_installed_packages \
@@ -2123,6 +2125,7 @@
 				--list-cleanup --default-release \
                                 --no-install-recommends \
 				--trivial-only --no-remove --diff-only \
+				--no-install-recommends \
 				--tar-only --config-file --option --auto-remove' -- $cur ) )
 	else
 
@@ -4821,8 +4824,10 @@
 {
 	_muttaliases
 	_muttquery
-	cur=${COMP_WORDS[COMP_CWORD]}
-	COMPREPLY=( ${COMPREPLY[@]}  $( compgen -u -- "$cur" ) )
+
+	cur=`_get_cword`
+	COMPREPLY=( ${COMPREPLY[@]} $( compgen -u -- $cur ) )
+
 	return 0
 }
 
@@ -5348,7 +5353,7 @@
 	    ;;
 	*)
 	    _perlmodules
-            COMPREPLY=( ${COMPREPLY[@]} $( compgen -W '$( PAGER=cat man perl |  sed -ne "/perl.*Perl overview/,/perlwin32/p" | awk "\$NF=2 { print \$1}" | grep perl )' -- $cur ) )
+	    COMPREPLY=( ${COMPREPLY[@]} $( compgen -W '$( PAGER=/bin/cat man perl |  sed -ne "/perl.*Perl overview/,/perlwin32/p" | awk "\$NF=2 { print \$1}" | grep perl )' -- $cur ) )
 
 	    return 0
 	    ;;
@@ -5966,7 +5971,7 @@
 					-xvidencopts -of --verbose' -- $cur) )
 			;;
 		*)
-			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3gp|mpc|MPC|flac|FLAC|flv|FLV|aif|AIF|aiff|AIFF)'
+			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|m4[av]|M4[AV]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3gp|mpc|MPC|flac|FLAC|vro|VRO|flv|FLV|divx|DIVX|aif?(f)|AIF?(F))'
 			;;
 	esac
 
@@ -9308,6 +9313,15 @@
 	return 0
 }
 complete -F _svnlook $default svnlook
+
+_rrdtool ()
+{
+	cur=`_get_cword`
+	COMPREPLY=( $( compgen -W 'create update updatev graph dump \
+	                           restore last lastupdate first info \
+	                           fetch tune resize xport' -- $cur ) )
+}
+complete -F _rrdtool rrdtool
 }
 
 _filedir_xspec()

=== modified file 'contrib/bitkeeper'
--- a/contrib/bitkeeper	2002-06-12 20:03:23 +0000
+++ b/contrib/bitkeeper	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local BKCMDS
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	BKCMDS="$( bk help topics | grep '^  bk' | cut -d ' ' -f 4 | \
 		   xargs echo )"

=== modified file 'contrib/bittorrent'
--- a/contrib/bittorrent	2004-10-14 06:53:25 +0000
+++ b/contrib/bittorrent	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in

=== modified file 'contrib/cksfv'
--- a/contrib/cksfv	2004-03-30 20:39:11 +0000
+++ b/contrib/cksfv	2008-05-10 16:04:06 +0000
@@ -5,7 +5,7 @@
 _cksfv()
 {
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
   
 	if [ $COMP_CWORD -eq 1 ]; then
 		COMPREPLY=( $( compgen -W '-C -f -i -q -v' -- $cur ) )

=== modified file 'contrib/clisp'
--- a/contrib/clisp	2004-03-30 21:05:45 +0000
+++ b/contrib/clisp	2008-05-10 16:04:06 +0000
@@ -8,7 +8,7 @@
     local cur
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then

=== modified file 'contrib/dsniff'
--- a/contrib/dsniff	2003-12-31 07:22:37 +0000
+++ b/contrib/dsniff	2008-05-10 16:04:06 +0000
@@ -9,7 +9,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -39,7 +39,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -67,7 +67,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -96,7 +96,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -120,7 +120,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -145,7 +145,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-d -I -p' -- $cur ) )
@@ -163,7 +163,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -187,7 +187,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -211,7 +211,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -235,7 +235,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -259,7 +259,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-d' -- $cur ) )

=== modified file 'contrib/freeciv'
--- a/contrib/freeciv	2003-12-31 07:22:37 +0000
+++ b/contrib/freeciv	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -34,7 +34,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in

=== modified file 'contrib/gcl'
--- a/contrib/gcl	2004-03-30 21:05:45 +0000
+++ b/contrib/gcl	2008-05-10 16:04:06 +0000
@@ -8,7 +8,7 @@
     local cur
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then

=== modified file 'contrib/gkrellm'
--- a/contrib/gkrellm	2003-12-31 07:22:37 +0000
+++ b/contrib/gkrellm	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in

=== modified file 'contrib/gnatmake'
--- a/contrib/gnatmake	2002-08-19 14:57:44 +0000
+++ b/contrib/gnatmake	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
         if [[ "$cur" == -* ]]; then
 		# relevant (and less relevant ;-) )options completion

=== modified file 'contrib/isql'
--- a/contrib/isql	2003-12-31 07:22:37 +0000
+++ b/contrib/isql	2008-05-10 16:04:06 +0000
@@ -5,7 +5,7 @@
 _isql()
 {
 	local cur
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
   
 	COMPREPLY=( $( grep \\[$cur $ODBCINI | tr -d \\[\\] ) )
 }

=== modified file 'contrib/larch'
--- a/contrib/larch	2003-12-31 07:22:37 +0000
+++ b/contrib/larch	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	if [ $COMP_CWORD -eq 1 ] || [[ "$prev" == -* ]]; then

=== modified file 'contrib/lisp'
--- a/contrib/lisp	2004-03-30 21:05:45 +0000
+++ b/contrib/lisp	2008-05-10 16:04:06 +0000
@@ -8,7 +8,7 @@
     local cur
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then

=== modified file 'contrib/mailman'
--- a/contrib/mailman	2004-03-30 21:05:34 +0000
+++ b/contrib/mailman	2008-05-10 16:04:06 +0000
@@ -12,7 +12,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -43,7 +43,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -70,7 +70,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -94,7 +94,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -117,7 +117,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -147,7 +147,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-a --advertised \
@@ -163,7 +163,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-h --help' -- $cur ) )
@@ -179,7 +179,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '--all-vhost= -v \
@@ -196,7 +196,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-w --with-listnames \
@@ -213,7 +213,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -248,7 +248,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -271,7 +271,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-l --lock -i --interactive \
@@ -288,7 +288,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-l --language -q --quiet -h --help' -- $cur ) )
@@ -304,7 +304,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '--archives -a \
@@ -321,7 +321,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 		prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -347,7 +347,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -389,7 +389,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-s --status -n --dry-run \
@@ -404,7 +404,7 @@
 	local cur prev
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in
@@ -429,7 +429,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '--marshal -m --pickle -p --noprint -n -h --help' -- $cur ) )
@@ -445,7 +445,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '--all -a --verbose -v \
@@ -462,7 +462,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-f -v -h' -- $cur ) )
@@ -476,7 +476,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-q --quiet -h --help' -- $cur ) )
@@ -490,7 +490,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-c --listcreator -h --help' -- $cur ) )
@@ -504,7 +504,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-r --runner= --once -o \
@@ -519,7 +519,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-n --no-restart -u --run-as-user \

=== modified file 'contrib/mcrypt'
--- a/contrib/mcrypt	2003-12-31 07:22:37 +0000
+++ b/contrib/mcrypt	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur prev i decrypt
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	case "$prev" in

=== modified file 'contrib/modules'
--- a/contrib/modules	2005-07-11 15:49:14 +0000
+++ b/contrib/modules	2008-05-10 16:04:06 +0000
@@ -45,7 +45,7 @@
    local cur prev options
 
    COMPREPLY=()
-   cur=${COMP_WORDS[COMP_CWORD]}
+   cur=`_get_cword`
    prev=${COMP_WORDS[COMP_CWORD-1]}
 
    if [ $COMP_CWORD -eq 1 ] ; then

=== modified file 'contrib/mtx'
--- a/contrib/mtx	2003-12-31 23:54:41 +0000
+++ b/contrib/mtx	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
     local cur prev options tapes drives
     
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
     options="-f nobarcode invert noattach --version inquiry noattach \

=== modified file 'contrib/p4'
--- a/contrib/p4	2003-12-31 07:22:37 +0000
+++ b/contrib/p4	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur prev prev2 p4commands p4filetypes
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	# rename isn't really a command

=== modified file 'contrib/povray'
--- a/contrib/povray	2003-12-31 07:22:37 +0000
+++ b/contrib/povray	2008-05-10 16:04:06 +0000
@@ -8,7 +8,7 @@
   defoext=png # default output extension, if cannot be determined FIXME
 
   COMPREPLY=()
-  povcur=${COMP_WORDS[COMP_CWORD]}
+  povcur=`_get_cword`
   prev=${COMP_WORDS[COMP_CWORD-1]}
 
   _expand || return 0

=== modified file 'contrib/ri'
--- a/contrib/ri	2006-02-25 13:25:59 +0000
+++ b/contrib/ri	2008-05-10 16:04:06 +0000
@@ -39,7 +39,7 @@
 	local -a classes
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	ri_path=$(type -p ri)
 	# which version of ri are we using?

=== modified file 'contrib/sbcl'
--- a/contrib/sbcl	2004-03-30 21:05:45 +0000
+++ b/contrib/sbcl	2008-05-10 16:04:06 +0000
@@ -8,7 +8,7 @@
     local cur
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
 
     # completing an option (may or may not be separated by a space)
     if [[ "$cur" == -* ]]; then

=== modified file 'contrib/sitecopy'
--- a/contrib/sitecopy	2005-01-03 01:44:22 +0000
+++ b/contrib/sitecopy	2008-05-10 16:04:06 +0000
@@ -9,7 +9,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	case "$cur" in
 	    --*)

=== modified file 'contrib/snownews'
--- a/contrib/snownews	2005-01-03 02:00:44 +0000
+++ b/contrib/snownews	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	if [[ "$cur" == -* ]]; then
 		# return list of available options

=== modified file 'contrib/svk'
--- a/contrib/svk	2006-03-01 09:45:03 +0000
+++ b/contrib/svk	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur prev commands options command
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	commands='add admin annotate ann blame praise cat checkout co cleanup \
 		cmerge cm commit ci copy cp delete del remove rm depotmap \

=== modified file 'contrib/unace'
--- a/contrib/unace	2003-12-31 07:22:37 +0000
+++ b/contrib/unace	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	case "$cur" in
 	    -*)

=== modified file 'contrib/unrar'
--- a/contrib/unrar	2004-07-05 21:37:47 +0000
+++ b/contrib/unrar	2008-05-10 16:04:06 +0000
@@ -7,7 +7,7 @@
 	local cur
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 
 	case "$cur" in
 	    -*)

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-06 19:37:03 +0000
+++ b/debian/changelog	2008-05-10 16:04:06 +0000
@@ -2,6 +2,15 @@
 
   [ David Paleino ]
   * New upstream release
+    - add more completions to aptitude (Closes: #432289)
+    - fixed UTF-8 problem with _get_cword(), thanks to
+      Andrei Paskevich (Closes: #472132)
+    - fixed autoremove completion, thanks to Flavio Visentin
+      (Closes: #474974)
+    - cmf and CMF added to playmidi completion (Closes: #365658)
+    - added rrdtool completion, thanks to Justin Pryzby (Closes: #428641)
+    - added OpenDocument completion for unzip/zipinfo (.od{f,g,p,s,t})
+      (Closes: #472940)
   * debian/copyright - now in a fancier machine-parsable format.
   * debian/control:
     - added myself to Uploaders
@@ -13,6 +22,7 @@
   * debian/dirs, debian/install and debian/links added
   * debian/rules:
     - refactored to make use of debian/{dirs,install,links}
+
   [ Steve Kemp ]
   * Applied patch to fix completion of unmount command.
     (Closes: #470539)
@@ -27,7 +37,7 @@
   * Update apt-get completion to include the flag "--no-install-recommends"
     (Closes: #475242)
 
- -- David Paleino <d.paleino at gmail.com>  Thu, 01 May 2008 23:11:27 +0200
+ -- David Paleino <d.paleino at gmail.com>  Sat, 10 May 2008 17:59:26 +0200
 
 bash-completion (20060301-4) unstable; urgency=low
 



More information about the Bash-completion-commits mailing list