diff --git a/TEST b/TEST deleted file mode 100644 index 47e3aa85..00000000 --- a/TEST +++ /dev/null @@ -1 +0,0 @@ -Still trying to test CIA.vc diff --git a/bash_completion b/bash_completion index d4d1fe69..c9f8faf2 100644 --- a/bash_completion +++ b/bash_completion @@ -81,7 +81,7 @@ complete -d pushd # # 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 '!*.@(mpg|mpeg|avi|mov|qt)' xanim 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 @@ _rl_enabled() _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 @@ complete -F _umount $dirnames umount # that instead. # _mount() -{ local cur i sm host +{ + local cur i sm host COMPREPLY=() cur=`_get_cword` @@ -2068,14 +2070,14 @@ _apt_get() 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 @@ _apt_get() --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 @@ _muttaddr() { _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 @@ _perldoc() ;; *) _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 @@ _mplayer() -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 @@ _svnlook() 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() diff --git a/contrib/bitkeeper b/contrib/bitkeeper index 0e9adf81..2a805a77 100644 --- a/contrib/bitkeeper +++ b/contrib/bitkeeper @@ -7,7 +7,7 @@ _bk() { local BKCMDS COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` BKCMDS="$( bk help topics | grep '^ bk' | cut -d ' ' -f 4 | \ xargs echo )" diff --git a/contrib/bittorrent b/contrib/bittorrent index 539a3e0f..3821ce5b 100644 --- a/contrib/bittorrent +++ b/contrib/bittorrent @@ -7,7 +7,7 @@ _btdownload() local cur prev COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in diff --git a/contrib/cksfv b/contrib/cksfv index 3163f661..af6f2de3 100644 --- a/contrib/cksfv +++ b/contrib/cksfv @@ -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 ) ) diff --git a/contrib/clisp b/contrib/clisp index 6eb42a16..bc141f1d 100644 --- a/contrib/clisp +++ b/contrib/clisp @@ -8,7 +8,7 @@ _clisp() 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 diff --git a/contrib/dsniff b/contrib/dsniff index 09dc3282..4c464c9c 100644 --- a/contrib/dsniff +++ b/contrib/dsniff @@ -9,7 +9,7 @@ _arpspoof() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -39,7 +39,7 @@ _dnsspoof() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -67,7 +67,7 @@ _dsniff() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -96,7 +96,7 @@ _snarf() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -120,7 +120,7 @@ _macof() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -145,7 +145,7 @@ _sshmitm() 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 @@ _sshow() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -187,7 +187,7 @@ _tcpkill() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -211,7 +211,7 @@ _tcpnice() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -235,7 +235,7 @@ _urlsnarf() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -259,7 +259,7 @@ _webmitm() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '-d' -- $cur ) ) diff --git a/contrib/freeciv b/contrib/freeciv index 6f4b6c8f..5f444ca0 100644 --- a/contrib/freeciv +++ b/contrib/freeciv @@ -7,7 +7,7 @@ _civserver() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in @@ -34,7 +34,7 @@ _civclient() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in diff --git a/contrib/gcl b/contrib/gcl index 9e1b0118..df317bf8 100644 --- a/contrib/gcl +++ b/contrib/gcl @@ -8,7 +8,7 @@ _gcl() 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 diff --git a/contrib/gkrellm b/contrib/gkrellm index 1fe2d015..4a3f2349 100644 --- a/contrib/gkrellm +++ b/contrib/gkrellm @@ -7,7 +7,7 @@ _gkrellm() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in diff --git a/contrib/gnatmake b/contrib/gnatmake index cadf3601..490cecff 100644 --- a/contrib/gnatmake +++ b/contrib/gnatmake @@ -7,7 +7,7 @@ _gnatmake() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then # relevant (and less relevant ;-) )options completion diff --git a/contrib/isql b/contrib/isql index d4c21ab8..e9137cf7 100644 --- a/contrib/isql +++ b/contrib/isql @@ -5,7 +5,7 @@ _isql() { local cur - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` COMPREPLY=( $( grep \\[$cur $ODBCINI | tr -d \\[\\] ) ) } diff --git a/contrib/larch b/contrib/larch index 60ab6e9c..34275920 100644 --- a/contrib/larch +++ b/contrib/larch @@ -7,7 +7,7 @@ _larch() 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 diff --git a/contrib/lisp b/contrib/lisp index f1afe8d1..a530e971 100644 --- a/contrib/lisp +++ b/contrib/lisp @@ -8,7 +8,7 @@ _lisp() 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 diff --git a/contrib/mailman b/contrib/mailman index 0d92a011..375d1bf6 100644 --- a/contrib/mailman +++ b/contrib/mailman @@ -12,7 +12,7 @@ _add_members() 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 @@ _remove_members() 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 @@ _find_member() 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 @@ _clone_member() 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 @@ _sync_members() 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 @@ _list_lists() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '-a --advertised \ @@ -163,7 +163,7 @@ _unshunt() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '-h --help' -- $cur ) ) @@ -179,7 +179,7 @@ _list_admins() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '--all-vhost= -v \ @@ -196,7 +196,7 @@ _list_owners() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '-w --with-listnames \ @@ -213,7 +213,7 @@ _list_members() 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 @@ _change_pw() 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 @@ _withlist() 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 @@ _newlist() 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 @@ _rmlist() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '--archives -a \ @@ -321,7 +321,7 @@ _config_list() 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 @@ _arch() 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 @@ _cleanarch() 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 @@ _inject() 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 @@ _dumpdb() 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 @@ _check_db() 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 @@ _check_perms() 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 @@ _genaliases() 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 @@ _mmsitepass() 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 @@ _qrunner() 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 @@ _mailmanctl() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '-n --no-restart -u --run-as-user \ diff --git a/contrib/mcrypt b/contrib/mcrypt index 8b4e1db2..a6e4cf08 100644 --- a/contrib/mcrypt +++ b/contrib/mcrypt @@ -7,7 +7,7 @@ _mcrypt() local cur prev i decrypt COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` prev=${COMP_WORDS[COMP_CWORD-1]} case "$prev" in diff --git a/contrib/modules b/contrib/modules index 8b180b1a..8240bff8 100644 --- a/contrib/modules +++ b/contrib/modules @@ -45,7 +45,7 @@ _module () { 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 diff --git a/contrib/mtx b/contrib/mtx index 22b855d6..6afdf0e0 100644 --- a/contrib/mtx +++ b/contrib/mtx @@ -7,7 +7,7 @@ _mtx() 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 \ diff --git a/contrib/p4 b/contrib/p4 index d561722e..09347182 100644 --- a/contrib/p4 +++ b/contrib/p4 @@ -7,7 +7,7 @@ _p4() 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 diff --git a/contrib/povray b/contrib/povray index cea54821..2598d1d8 100644 --- a/contrib/povray +++ b/contrib/povray @@ -8,7 +8,7 @@ _povray() 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 diff --git a/contrib/ri b/contrib/ri index bbb1f3ff..d3b1115b 100644 --- a/contrib/ri +++ b/contrib/ri @@ -39,7 +39,7 @@ _ri() local -a classes COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` ri_path=$(type -p ri) # which version of ri are we using? diff --git a/contrib/sbcl b/contrib/sbcl index 51ecddd4..1b571b24 100644 --- a/contrib/sbcl +++ b/contrib/sbcl @@ -8,7 +8,7 @@ _sbcl() 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 diff --git a/contrib/sitecopy b/contrib/sitecopy index 09a49f54..67746e43 100644 --- a/contrib/sitecopy +++ b/contrib/sitecopy @@ -9,7 +9,7 @@ _sitecopy() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` case "$cur" in --*) diff --git a/contrib/snownews b/contrib/snownews index 8a1d1f42..602b6fb4 100644 --- a/contrib/snownews +++ b/contrib/snownews @@ -7,7 +7,7 @@ _snownews() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` if [[ "$cur" == -* ]]; then # return list of available options diff --git a/contrib/svk b/contrib/svk index 70cd81f3..c68266b3 100644 --- a/contrib/svk +++ b/contrib/svk @@ -7,7 +7,7 @@ _svk() 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 \ diff --git a/contrib/unace b/contrib/unace index 59f0ca22..6b90e572 100644 --- a/contrib/unace +++ b/contrib/unace @@ -7,7 +7,7 @@ _unace() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` case "$cur" in -*) diff --git a/contrib/unrar b/contrib/unrar index b47f1d3f..b67216b3 100644 --- a/contrib/unrar +++ b/contrib/unrar @@ -7,7 +7,7 @@ _unrar() local cur COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=`_get_cword` case "$cur" in -*) diff --git a/debian/changelog b/debian/changelog index 250a10e0..a15f8681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,15 @@ bash-completion (20080501-1) UNRELEASED; urgency=low [ 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 @@ bash-completion (20080501-1) UNRELEASED; urgency=low * 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 @@ bash-completion (20080501-1) UNRELEASED; urgency=low * Update apt-get completion to include the flag "--no-install-recommends" (Closes: #475242) - -- David Paleino Thu, 01 May 2008 23:11:27 +0200 + -- David Paleino Sat, 10 May 2008 17:59:26 +0200 bash-completion (20060301-4) unstable; urgency=low