Update of /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/shells
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10243/10.2-gcc3.3/unstable/main/finkinfo/shells
Modified Files:
bash-completion.info bash-completion.patch
Log Message:
new upstream bash-completion (20041017)
Index: bash-completion.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/shells/bash-completion.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bash-completion.patch 6 Aug 2004 18:53:42 -0000 1.6
+++ bash-completion.patch 8 Nov 2004 03:23:49 -0000 1.7
@@ -1,6 +1,6 @@
diff -uNr 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 2004-08-06 14:48:47.000000000
-0400
+--- bash_completion/bash-completion.sh 1969-12-31 18:00:00.000000000 -0600
++++ bash_completion-new/bash-completion.sh 2004-11-04 16:41:45.000000000
-0600
@@ -0,0 +1,14 @@
+#!/bin/sh
+
@@ -17,24 +17,24 @@
+ unset bash bmajor bminor
+fi
diff -uNr bash_completion/bash_completion bash_completion-new/bash_completion
---- bash_completion/bash_completion 2004-07-11 14:36:39.000000000 -0400
-+++ bash_completion-new/bash_completion 2004-08-06 14:50:08.000000000
-0400
+--- bash_completion/bash_completion 2004-10-17 03:25:34.000000000 -0500
++++ bash_completion-new/bash_completion 2004-11-04 16:48:19.000000000
-0600
@@ -31,14 +31,14 @@
if [ -n "${FUNCNAME:-}" ]; then
# we're being sourced from within a function, so we can't use
# 'declare', as this will create local variables within a function
-- BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} 2>/dev/null
-- BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} \
-+ BASH_COMPLETION=${BASH_COMPLETION:[EMAIL
PROTECTED]@/etc/bash_completion} 2>/dev/null
-+ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:[EMAIL
PROTECTED]@/etc/bash_completion.d} \
+- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" 2>/dev/null
+- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" \
++ BASH_COMPLETION="${BASH_COMPLETION:[EMAIL
PROTECTED]@/etc/bash_completion}" 2>/dev/null
++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:[EMAIL
PROTECTED]@/etc/bash_completion.d}" \
2>/dev/null
else
-- declare -r BASH_COMPLETION=${BASH_COMPLETION:-/etc/bash_completion} \
-+ declare -r BASH_COMPLETION=${BASH_COMPLETION:[EMAIL
PROTECTED]@/etc/bash_completion} \
+- declare -r BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" \
++ declare -r BASH_COMPLETION="${BASH_COMPLETION:[EMAIL
PROTECTED]@/etc/bash_completion}" \
2>/dev/null
declare -r \
-- BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:=/etc/bash_completion.d} \
-+ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:[EMAIL
PROTECTED]@/etc/bash_completion.d} \
+- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"\
++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:[EMAIL
PROTECTED]@/etc/bash_completion.d}"\
2>/dev/null
fi
@@ -47,7 +47,29 @@
# This function checks whether a given readline variable
# is `on'.
-@@ -332,7 +332,7 @@
+@@ -219,7 +219,9 @@
+ #
+ _interfaces()
+ {
+- if [ -f /etc/debian_version ]; then
++ if [ $UNAME eq "Darwin" ]; then
++ COMPREPLY=( $( /sbin/ifconfig | grep -E '^[^[:space:]]+:' | cut
-d: -f1 ) )
++ elif [ -f /etc/debian_version ]; then
+ # Debian system
+ COMPREPLY=( $( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \
+ /etc/network/interfaces ) )
+@@ -319,8 +321,8 @@
+ _services()
+ {
+ local sysvdir famdir
+- [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d ||
sysvdir=/etc/init.d
+- famdir=/etc/xinetd.d
++ [ -d @PREFIX@/etc/rc.d/init.d ] && [EMAIL PROTECTED]@/etc/rc.d/init.d
|| [EMAIL PROTECTED]@/etc/init.d
++ [EMAIL PROTECTED]@/etc/xinetd.d
+ COMPREPLY=( $( builtin echo
$sysvdir/!(*.rpmsave|*.rpmorig|*~|functions)) )
+
+ if [ -d $famdir ]; then
+@@ -332,7 +334,7 @@
# Linux ifconfig(8) and iwconfig(8) helper function
#
@@ -56,7 +78,7 @@
_ifwconfig()
{
COMPREPLY=()
-@@ -503,7 +503,7 @@
+@@ -503,7 +505,7 @@
# 'service' command and/or the SysV init.d directory, followed by
# that script's available commands
#
@@ -65,7 +87,7 @@
_service()
{
local cur sysvdir
-@@ -519,8 +519,8 @@
+@@ -519,8 +521,8 @@
# don't complete past 2nd token
[ $COMP_CWORD -gt 2 ] && return 0
@@ -76,7 +98,7 @@
if [[ $COMP_CWORD -eq 1 ]] && [[ $prev == "service" ]]; then
_services
-@@ -534,8 +534,8 @@
+@@ -533,8 +535,8 @@
return 0
}
[ -n "${have:-}" ] && complete -F _service service
@@ -87,7 +109,7 @@
# chown(1) completion
#
-@@ -829,7 +829,7 @@
+@@ -828,7 +830,7 @@
# Linux and FreeBSD killall(1) completion.
#
@@ -96,7 +118,7 @@
_killall()
{
local cur
-@@ -847,7 +847,7 @@
+@@ -846,7 +848,7 @@
return 0
}
@@ -105,7 +127,7 @@
# Linux and FreeBSD pgrep(1) completion.
#
-@@ -983,7 +983,7 @@
+@@ -982,7 +984,7 @@
# Linux ifconfig(8) completion
#
@@ -114,7 +136,7 @@
_ifconfig()
{
local cur
-@@ -995,7 +995,7 @@
+@@ -994,7 +996,7 @@
COMPREPLY=( $( compgen -W '[EMAIL PROTECTED]' -- $cur ) )
}
@@ -123,16 +145,16 @@
complete -F _ifconfig ifconfig
# Linux iwconfig(8) completion
-@@ -1819,7 +1819,7 @@
+@@ -1820,7 +1822,7 @@
if [ -n "$special" ]; then
case $special in
remove)
- if [ -f /etc/debian_version ]; then
+ if [ -f /etc/debian_version ] || [ -x
"@PREFIX@/bin/fink" ]; then
# Debian system
- COMPREPLY=( $( _comp-dpkg-installed-packages \
+ COMPREPLY=( $( _comp_dpkg_installed_packages \
$cur ) )
-@@ -1956,7 +1956,7 @@
+@@ -1957,7 +1959,7 @@
have aptitude && {
_comp_dpkg_hold_packages()
{
@@ -141,7 +163,7 @@
| cut -d\ -f2
}
-@@ -2117,7 +2117,7 @@
+@@ -2118,7 +2120,7 @@
prev=${COMP_WORDS[COMP_CWORD-1]}
if [ "$prev" = "-s" ]; then
@@ -150,7 +172,7 @@
COMPREPLY=( $( </etc/shells ) )
else
COMPREPLY=( $( chsh -l | grep "^$cur" ) )
-@@ -2200,8 +2200,10 @@
+@@ -2201,8 +2203,10 @@
kh=()
# ssh config files
@@ -163,25 +185,16 @@
if [ [EMAIL PROTECTED] -gt 0 ]; then
# expand path (if present) to global known hosts file
-@@ -3131,7 +3133,7 @@
- ;;
- -s)
- # shells
-- COMPREPLY=( $( grep ^${cur:-[^#]} /etc/shells ) )
-+ COMPREPLY=( $( grep ^${cur:-[^#]} @PREFIX@/etc/shells )
)
- ;;
- *)
- ;;
-@@ -3441,7 +3443,7 @@
+@@ -3448,7 +3452,7 @@
have dpkg && {
- _comp-dpkg-installed-packages()
+ _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
}
-@@ -4130,6 +4132,7 @@
+@@ -4137,6 +4141,7 @@
# find the admin dir
for i in alternatives dpkg/alternatives rpm/alternatives; do
[ -d /var/lib/$i ] && admindir=/var/lib/$i && break
@@ -189,7 +202,7 @@
done
for (( i=1; i < COMP_CWORD; i++ )); do
if [[ "${COMP_WORDS[i]}" == --admindir ]]; then
-@@ -6059,6 +6062,7 @@
+@@ -7222,6 +7227,7 @@
\"${cur#[\`\"\']}\" 2>/dev/null ) \
$( compgen -d -- $cur ) )
}
@@ -198,8 +211,8 @@
$BASH_COMPLETION | \
# read exclusion compspecs
diff -uNr 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 2004-08-06 14:48:47.000000000 -0400
+--- bash_completion/fink.sh 1969-12-31 18:00:00.000000000 -0600
++++ bash_completion-new/fink.sh 2004-11-04 16:41:46.000000000 -0600
@@ -0,0 +1,128 @@
+#!/bin/bash
+
@@ -331,8 +344,8 @@
+}
\ No newline at end of file
diff -uNr 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 2004-08-06 14:48:47.000000000 -0400
+--- bash_completion/open.sh 1969-12-31 18:00:00.000000000 -0600
++++ bash_completion-new/open.sh 2004-11-04 16:41:46.000000000 -0600
@@ -0,0 +1,106 @@
+#!/bin/bash
+
Index: bash-completion.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/shells/bash-completion.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bash-completion.info 6 Aug 2004 18:53:42 -0000 1.6
+++ bash-completion.info 8 Nov 2004 03:23:49 -0000 1.7
@@ -1,8 +1,8 @@
Package: bash-completion
-Version: 20040711
+Version: 20041017
Revision: 1
Source: http://www.caliban.org/files/bash/%n-%v.tar.gz
-Source-MD5: 90ee706965dbf7b24515220d3bdc1f85
+Source-MD5: b9f75cc7b11e5768d360f4a28f44067b
SourceDirectory: bash_completion
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: echo "none needed"
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
