Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/shells In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4789
Modified Files: bash-completion.info bash-completion.patch Log Message: to stable Index: bash-completion.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/shells/bash-completion.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bash-completion.patch 10 Jan 2007 19:17:06 -0000 1.2 +++ bash-completion.patch 14 Feb 2008 15:58:55 -0000 1.3 @@ -1,25 +1,31 @@ -diff -uNr bash_completion/bash-completion.sh bash_completion-new/bash-completion.sh +diff -uNbwr bash_completion/bash-completion.sh bash_completion-new/bash-completion.sh --- bash_completion/bash-completion.sh 1969-12-31 19:00:00.000000000 -0500 -+++ bash_completion-new/bash-completion.sh 2005-08-25 13:57:56.000000000 -0400 -@@ -0,0 +1,14 @@ ++++ bash_completion-new/bash-completion.sh 2008-01-14 15:55:38.000000000 -0500 +@@ -0,0 +1,20 @@ +#!/bin/sh + -+if test ${SHELL#*bin/} = "bash"; then -+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} -+ if [ "$PS1" ] && [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] \ -+ && [ -f @PREFIX@/etc/bash_completion ]; then # interactive shell -+ # Source completion code -+ . @PREFIX@/etc/bash_completion -+ fi -+ if [ -f @PREFIX@/share/init/bash/completions ]; then -+ . @PREFIX@/share/init/bash/completions -+ fi -+ unset bash bmajor bminor ++if [ -n "$BASH_VERSION" ]; then ++ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} ++ if [ $bmajor -eq 1 ]; then ++ exit 0 ++ fi ++ if [ $bmajor -eq 2 ] && [ $bminor '<' 05 ]; then ++ exit 0 ++ fi ++ ++ if [ "$PS1" ] && [ -f @PREFIX@/etc/bash_completion ]; then # interactive shell ++ # Source completion code ++ . @PREFIX@/etc/bash_completion ++ if [ -f @PREFIX@/share/init/bash/completions ]; then ++ . @PREFIX@/share/init/bash/completions ++ fi ++ fi ++ unset bash bmajor bminor +fi -diff -uNr bash_completion/bash_completion bash_completion-new/bash_completion ---- bash_completion/bash_completion 2005-07-21 15:21:22.000000000 -0400 -+++ bash_completion-new/bash_completion 2005-08-25 14:02:22.000000000 -0400 -@@ -31,8 +31,8 @@ +diff -uNbwr bash_completion/bash_completion bash_completion-new/bash_completion +--- bash_completion/bash_completion 2006-03-01 11:20:18.000000000 -0500 ++++ bash_completion-new/bash_completion 2008-01-14 15:51:52.000000000 -0500 +@@ -32,8 +32,8 @@ { # These declarations must go within braces in order to be able to silence # readonly variable errors. @@ -30,7 +36,16 @@ } 2>/dev/null || : readonly BASH_COMPLETION BASH_COMPLETION_DIR -@@ -167,7 +167,7 @@ +@@ -89,7 +89,7 @@ + complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi + complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype kdvi dvipdf advi + complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf +-complete -f -X '!*.@(@(?(e)ps|?(E)PS)?(.gz|.GZ)|pdf|PDF|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' evince ++complete -f -X '!*.@(@(?(e)ps|?(E)PS)?(.gz|.GZ)|pdf|PDF|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' evince + complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf + complete -f -X '!*.texi*' makeinfo texi2html + complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi +@@ -169,7 +169,7 @@ # use GNU sed if we have it, since its extensions are still used in our code # @@ -39,7 +54,7 @@ # This function checks whether a given readline variable # is `on'. -@@ -224,7 +224,9 @@ +@@ -226,7 +226,9 @@ # _configured_interfaces() { @@ -50,7 +65,7 @@ # Debian system COMPREPLY=( $( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \ /etc/network/interfaces ) ) -@@ -339,8 +341,8 @@ +@@ -346,8 +348,8 @@ _services() { local sysvdir famdir @@ -61,7 +76,7 @@ COMPREPLY=( $( builtin echo $sysvdir/!(*.rpmsave|*.rpmorig|*~|functions)) ) if [ -d $famdir ]; then -@@ -528,7 +530,7 @@ +@@ -535,7 +537,7 @@ # 'service' command and/or the SysV init.d directory, followed by # that script's available commands # @@ -70,7 +85,7 @@ _service() { local cur sysvdir -@@ -544,8 +546,8 @@ +@@ -551,8 +553,8 @@ # don't complete past 2nd token [ $COMP_CWORD -gt 2 ] && return 0 @@ -81,7 +96,7 @@ if [[ $COMP_CWORD -eq 1 ]] && [[ $prev == "service" ]]; then _services -@@ -558,8 +560,8 @@ +@@ -565,8 +567,8 @@ return 0 } && complete -F _service service @@ -92,7 +107,16 @@ # chown(1) completion # -@@ -850,7 +852,7 @@ +@@ -806,7 +808,7 @@ + [ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \ + -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \ + -o $UNAME = OpenBSD ] && \ +-complete -F _man $filenames man ++complete -F _man $filenames man apropos whatis + + # renice(8) completion + # +@@ -859,7 +861,7 @@ # Linux and FreeBSD killall(1) completion. # @@ -101,7 +125,7 @@ _killall() { local cur -@@ -868,7 +870,7 @@ +@@ -877,7 +879,7 @@ return 0 } @@ -110,7 +134,7 @@ # Linux and FreeBSD pgrep(1) completion. # -@@ -2006,7 +2008,7 @@ +@@ -2034,7 +2036,7 @@ if [ -n "$special" ]; then case $special in remove) @@ -119,16 +143,79 @@ # Debian system COMPREPLY=( $( _comp_dpkg_installed_packages \ $cur ) ) -@@ -2143,7 +2145,7 @@ - have aptitude && { +@@ -2061,7 +2063,7 @@ + -@(t|-target-release|-default-release)) + COMPREPLY=( $( apt-cache policy | \ + grep "release.o=Debian,a=$cur" | \ +- sed -e "s/.*a=\(\w*\).*/\1/" | uniq ) ) ++ sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2> /dev/null) ) + return 0 + ;; + +@@ -2108,7 +2110,7 @@ + + if [ "$cur" != show ]; then + for (( i=0; i < [EMAIL PROTECTED]; i++ )); do +- if [[ ${COMP_WORDS[i]} == @(add|depends|dotty|policy|rdepends|show?(pkg|src|)) ]]; then ++ if [[ ${COMP_WORDS[i]} == @(add|depends|dotty|policy|rdepends|madison|show?(pkg|src|)) ]]; then + special=${COMP_WORDS[i]} + fi + done +@@ -2156,7 +2158,7 @@ + COMPREPLY=( $( compgen -W 'add gencaches show showpkg showsrc \ + stats dump dumpavail unmet search search \ + depends rdepends pkgnames dotty xvcg \ +- policy' -- $cur ) ) ++ policy madison' -- $cur ) ) + + fi + +@@ -2177,7 +2179,7 @@ + } || { _comp_dpkg_hold_packages() { - grep -B 2 'hold' /var/lib/dpkg/status | grep "Package: $1" \ + grep -B 2 'hold' @PREFIX@/var/lib/dpkg/status | grep "Package: $1" \ | cut -d\ -f2 } + } +@@ -2200,7 +2202,7 @@ + -Z -v --verbose' -@@ -2304,7 +2306,7 @@ + for (( i=0; i < [EMAIL PROTECTED]; i++ )); do +- if [[ ${COMP_WORDS[i]} == @(install|reinstall|hold|unhold|markauto|unmarkauto|dist-upgrade|download|show|forbid-version|purge|remove) ]]; then ++ if [[ ${COMP_WORDS[i]} == @(install|reinstall|hold|unhold|markauto|unmarkauto|dist-upgrade|download|show|forbid-version|purge|remove|changelog) ]]; then + special=${COMP_WORDS[i]} + fi + #exclude some mutually exclusive options +@@ -2210,7 +2212,7 @@ + + if [[ -n "$special" ]]; then + case $special in +- @(install|hold|markauto|unmarkauto|dist-upgrade|download|show)) ++ @(install|hold|markauto|unmarkauto|dist-upgrade|download|show|changelog)) + COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) ) + return 0 + ;; +@@ -2240,7 +2242,7 @@ + -@(t|-target-release|-default-release)) + COMPREPLY=( $( apt-cache policy | \ + grep "release.o=Debian,a=$cur" | \ +- sed -e "s/.*a=\(\w*\).*/\1/" | uniq ) ) ++ sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2> /dev/null ) ) + return 0 + ;; + +@@ -2253,7 +2255,7 @@ + autoclean install reinstall remove \ + hold unhold purge markauto unmarkauto \ + dist-upgrade download search show \ +- forbid-version' -- $cur ) ) ++ forbid-version changelog' -- $cur ) ) + fi + + +@@ -2339,7 +2341,7 @@ prev=${COMP_WORDS[COMP_CWORD-1]} if [ "$prev" = "-s" ]; then @@ -137,7 +224,7 @@ COMPREPLY=( $( </etc/shells ) ) else COMPREPLY=( $( chsh -l | grep "^$cur" ) ) -@@ -2387,6 +2389,8 @@ +@@ -2422,6 +2424,8 @@ kh=() # ssh config files @@ -146,7 +233,7 @@ [ -r /etc/ssh/ssh_config ] && config=( [EMAIL PROTECTED] /etc/ssh/ssh_config ) [ -r ~/.ssh/config ] && -@@ -2405,12 +2409,20 @@ +@@ -2440,12 +2444,20 @@ if [ -r "$global_kh" ]; then kh=( "$global_kh" ) else @@ -167,7 +254,16 @@ [ -r /etc/known_hosts2 ] && kh=( [EMAIL PROTECTED] /etc/known_hosts2 ) [ -d /etc/ssh2/knownhosts ] && -@@ -3325,8 +3337,8 @@ +@@ -3323,7 +3335,7 @@ + have bzip2 && + _bzip2() + { +- local cur prev xspec ++ local cur prev xspec IFS=$'\t\n' + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} +@@ -3363,8 +3375,8 @@ { local config @@ -178,16 +274,34 @@ for (( i=2; i < COMP_CWORD; i++ )); do if [[ "${COMP_WORDS[i]}" == -config ]]; then config=${COMP_WORDS[i+1]} -@@ -4163,7 +4175,7 @@ - have dpkg && { +@@ -4206,7 +4218,7 @@ + } || { _comp_dpkg_installed_packages() { - grep -A 2 "Package: $1" /var/lib/dpkg/status | \ + grep -A 2 "Package: $1" @PREFIX@/var/lib/dpkg/status | \ grep -B 2 'ok installed' | grep "Package: $1" | cut -d\ -f2 } + } +@@ -4981,7 +4993,7 @@ + --no-cc --package-version -z --no-compress \ + --ui --interface -u \ + wnpp boot-floppies kernel-image' -- $cur ) \ +- $( apt-cache pkgnames -- $cur ) ) ++ $( apt-cache pkgnames -- $cur 2> /dev/null ) ) + _filedir + return 0 + } && +@@ -5016,7 +5028,7 @@ + -B --bts -l --ldap --no-ldap --proxy= --http_proxy= \ + -s --source -w --web -u --ui --interface \ + wnpp boot-floppies' -- $cur ) \ +- $( apt-cache pkgnames -- $cur ) ) ++ $( apt-cache pkgnames -- $cur 2> /dev/null ) ) + } && + complete -F _querybts $filenames querybts -@@ -4854,6 +4866,7 @@ +@@ -5029,6 +5041,7 @@ # find the admin dir for i in alternatives dpkg/alternatives rpm/alternatives; do [ -d /var/lib/$i ] && admindir=/var/lib/$i && break @@ -195,7 +309,25 @@ done for (( i=1; i < COMP_CWORD; i++ )); do if [[ "${COMP_WORDS[i]}" == --admindir ]]; then -@@ -8267,6 +8280,7 @@ +@@ -5888,7 +5901,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)' ++ _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)' + ;; + esac + +@@ -8803,7 +8816,7 @@ + COMPREPLY=( $( compgen -W '-s -o -m -M -z -l -L -w -a -t \ + -c -S -d -p -C -T -8' -- $cur ) ) + else +- COMPREPLY=( $( command ls /etc/minirc.* | sed -e 's|/etc/minirc.||' | grep "^$cur" ) ) ++ COMPREPLY=( $( command ls /etc/minicom/minirc.* 2>/dev/null | sed -e 's|/etc/minicom/minirc.||' | grep "^$cur" ) ) + fi + } && + complete -F _minicom minicom +@@ -9253,6 +9266,7 @@ \"${cur#[\`\"\']}\" 2>/dev/null ) \ $( compgen -d -- $cur ) ) } @@ -203,9 +335,9 @@ list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' \ $BASH_COMPLETION | \ # read exclusion compspecs -diff -uNr bash_completion/fink.sh bash_completion-new/fink.sh +diff -uNbwr bash_completion/fink.sh bash_completion-new/fink.sh --- bash_completion/fink.sh 1969-12-31 19:00:00.000000000 -0500 -+++ bash_completion-new/fink.sh 2005-08-25 13:57:56.000000000 -0400 ++++ bash_completion-new/fink.sh 2008-01-14 15:51:52.000000000 -0500 @@ -0,0 +1,128 @@ +#!/bin/bash + @@ -336,9 +468,9 @@ +complete $filenames -F _fink fink +} \ No newline at end of file -diff -uNr bash_completion/open.sh bash_completion-new/open.sh +diff -uNbwr bash_completion/open.sh bash_completion-new/open.sh --- bash_completion/open.sh 1969-12-31 19:00:00.000000000 -0500 -+++ bash_completion-new/open.sh 2005-08-25 13:57:56.000000000 -0400 ++++ bash_completion-new/open.sh 2008-01-14 15:51:52.000000000 -0500 @@ -0,0 +1,106 @@ +#!/bin/bash + Index: bash-completion.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/shells/bash-completion.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bash-completion.info 10 Jan 2007 19:17:06 -0000 1.2 +++ bash-completion.info 14 Feb 2008 15:58:55 -0000 1.3 @@ -1,18 +1,19 @@ Package: bash-completion -Version: 20050721 -Revision: 1 +Version: 20060301 +Revision: 3 Source: http://www.caliban.org/files/bash/%n-%v.tar.gz -Source-MD5: 08e5321ead7079c84822368d7a41deda +Source-MD5: 9bca1cf97e8f8c73e3ef560cc9dead21 SourceDirectory: bash_completion PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 CompileScript: echo "none needed" InstallScript: << - install -d -m 755 %i/etc - install -d -m 755 %i/etc/bash_completion.d - install -d -m 755 %i/etc/profile.d - install -m 755 bash_completion %i/etc/ - install -m 755 bash-completion.sh %i/etc/profile.d/ - install -m 755 fink.sh open.sh contrib/* %i/etc/bash_completion.d/ + install -d -m 755 %i/etc + install -d -m 755 %i/etc/bash_completion.d + install -d -m 755 %i/etc/profile.d + install -m 755 bash_completion %i/etc/ + install -m 755 bash-completion.sh %i/etc/profile.d/ + install -m 755 fink.sh open.sh contrib/* %i/etc/bash_completion.d/ + rm -rf %i/etc/bash_completion.d/hg << DocFiles: BUGS COPYING Changelog README Description: Command-line completions for bash ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs