Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/shells
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24897/10.4-transitional/unstable/main/finkinfo/shells
Modified Files:
bash-completion.info bash-completion.patch
Log Message:
new upstream
Index: bash-completion.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/shells/bash-completion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bash-completion.patch 27 Apr 2005 03:26:37 -0000 1.1
+++ bash-completion.patch 25 Aug 2005 18:16:13 -0000 1.2
@@ -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 18:00:00.000000000 -0600
-+++ bash_completion-new/bash-completion.sh 2004-11-04 16:41:45.000000000
-0600
+--- 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 @@
+#!/bin/sh
+
@@ -17,26 +17,18 @@
+ unset bash bmajor bminor
+fi
diff -uNr bash_completion/bash_completion bash_completion-new/bash_completion
---- 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}" \
- 2>/dev/null
- else
-- 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}"\
- 2>/dev/null
- fi
+--- 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 @@
+ {
+ # These declarations must go within braces in order to be able to silence
+ # readonly variable errors.
+- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}"
+- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"
++ BASH_COMPLETION="${BASH_COMPLETION:[EMAIL PROTECTED]@/etc/bash_completion}"
++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:[EMAIL
PROTECTED]@/etc/bash_completion.d}"
+ } 2>/dev/null || :
+ readonly BASH_COMPLETION BASH_COMPLETION_DIR
@@ -167,7 +167,7 @@
@@ -47,9 +39,9 @@
# This function checks whether a given readline variable
# is `on'.
-@@ -219,7 +219,9 @@
+@@ -224,7 +224,9 @@
#
- _interfaces()
+ _configured_interfaces()
{
- if [ -f /etc/debian_version ]; then
+ if [ $UNAME eq "Darwin" ]; then
@@ -58,27 +50,18 @@
# Debian system
COMPREPLY=( $( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \
/etc/network/interfaces ) )
-@@ -319,8 +321,8 @@
+@@ -339,8 +341,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
+- 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
++ [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
- #
--[ $UNAME = Linux -o $UNAME = FreeBSD ] && { have ifconfig || have iwconfig; }
&&
-+[ $UNAME = Linux -o $UNAME = FreeBSD -o $UNAME = Darwin ] && { have ifconfig
|| have iwconfig; } &&
- _ifwconfig()
- {
- COMPREPLY=()
-@@ -503,7 +505,7 @@
+@@ -528,7 +530,7 @@
# 'service' command and/or the SysV init.d directory, followed by
# that script's available commands
#
@@ -87,7 +70,7 @@
_service()
{
local cur sysvdir
-@@ -519,8 +521,8 @@
+@@ -544,8 +546,8 @@
# don't complete past 2nd token
[ $COMP_CWORD -gt 2 ] && return 0
@@ -98,10 +81,10 @@
if [[ $COMP_CWORD -eq 1 ]] && [[ $prev == "service" ]]; then
_services
-@@ -533,8 +535,8 @@
+@@ -558,8 +560,8 @@
return 0
- }
- [ -n "${have:-}" ] && complete -F _service service
+ } &&
+ complete -F _service service
-[ -d /etc/init.d/ ] && complete -F _service $default \
- $(for i in /etc/init.d/*; do echo ${i##*/}; done)
+[ -d @PREFIX@/etc/init.d/ ] && complete -F _service $default \
@@ -109,7 +92,7 @@
# chown(1) completion
#
-@@ -828,7 +830,7 @@
+@@ -850,7 +852,7 @@
# Linux and FreeBSD killall(1) completion.
#
@@ -118,7 +101,7 @@
_killall()
{
local cur
-@@ -846,7 +848,7 @@
+@@ -868,7 +870,7 @@
return 0
}
@@ -127,25 +110,7 @@
# Linux and FreeBSD pgrep(1) completion.
#
-@@ -982,7 +984,7 @@
-
- # Linux ifconfig(8) completion
- #
--[ $UNAME = Linux -o $UNAME = FreeBSD ] && have ifconfig &&
-+[ $UNAME = Linux -o $UNAME = FreeBSD -o $UNAME = Darwin ] && have ifconfig &&
- _ifconfig()
- {
- local cur
-@@ -994,7 +996,7 @@
-
- COMPREPLY=( $( compgen -W '[EMAIL PROTECTED]' -- $cur ) )
- }
--[ $UNAME = Linux -o $UNAME = FreeBSD ] && have ifconfig &&
-+[ $UNAME = Linux -o $UNAME = FreeBSD -o $UNAME = Darwin ] && have ifconfig &&
- complete -F _ifconfig ifconfig
-
- # Linux iwconfig(8) completion
-@@ -1820,7 +1822,7 @@
+@@ -2006,7 +2008,7 @@
if [ -n "$special" ]; then
case $special in
remove)
@@ -154,7 +119,7 @@
# Debian system
COMPREPLY=( $( _comp_dpkg_installed_packages \
$cur ) )
-@@ -1957,7 +1959,7 @@
+@@ -2143,7 +2145,7 @@
have aptitude && {
_comp_dpkg_hold_packages()
{
@@ -163,7 +128,7 @@
| cut -d\ -f2
}
-@@ -2118,7 +2120,7 @@
+@@ -2304,7 +2306,7 @@
prev=${COMP_WORDS[COMP_CWORD-1]}
if [ "$prev" = "-s" ]; then
@@ -172,20 +137,48 @@
COMPREPLY=( $( </etc/shells ) )
else
COMPREPLY=( $( chsh -l | grep "^$cur" ) )
-@@ -2201,8 +2203,10 @@
+@@ -2387,6 +2389,8 @@
kh=()
# ssh config files
-- [ -r /etc/ssh/ssh_config ] && config[0]=/etc/ssh/ssh_config
-- [ -r ~/.ssh/config ] && config[1]=~/.ssh/config
-+ [ -r @PREFIX@/etc/ssh/ssh_config ] && [EMAIL
PROTECTED]@/etc/ssh/ssh_config
-+ [ -r /etc/ssh/ssh_config ] && config[1]=/etc/ssh/ssh_config
-+ [ -r /etc/ssh_config ] && config[2]=/etc/ssh_config
-+ [ -r ~/.ssh/config ] && config[3]=~/.ssh/config
++ [ -r @PREFIX@/etc/ssh/ssh_config ] &&
++ config=( [EMAIL PROTECTED] @PREFIX@/etc/ssh/ssh_config )
+ [ -r /etc/ssh/ssh_config ] &&
+ config=( [EMAIL PROTECTED] /etc/ssh/ssh_config )
+ [ -r ~/.ssh/config ] &&
+@@ -2405,12 +2409,20 @@
+ if [ -r "$global_kh" ]; then
+ kh=( "$global_kh" )
+ else
++ [ -r @PREFIX@/etc/ssh/ssh_known_hosts ] &&
++ kh=( [EMAIL PROTECTED] @PREFIX@/etc/ssh/ssh_known_hosts )
+ [ -r /etc/ssh/ssh_known_hosts ] &&
+ kh=( [EMAIL PROTECTED] /etc/ssh/ssh_known_hosts )
++ [ -r @PREFIX@/etc/ssh/ssh_known_hosts2 ] &&
++ kh=( [EMAIL PROTECTED] @PREFIX@/etc/ssh/ssh_known_hosts2 )
+ [ -r /etc/ssh/ssh_known_hosts2 ] &&
+ kh=( [EMAIL PROTECTED] /etc/ssh/ssh_known_hosts2 )
++ [ -r @PREFIX@/etc/known_hosts ] &&
++ kh=( [EMAIL PROTECTED] @PREFIX@/etc/known_hosts )
+ [ -r /etc/known_hosts ] &&
+ kh=( [EMAIL PROTECTED] /etc/known_hosts )
++ [ -r @PREFIX@/etc/known_hosts2 ] &&
++ kh=( [EMAIL PROTECTED] @PREFIX@/etc/known_hosts2 )
+ [ -r /etc/known_hosts2 ] &&
+ kh=( [EMAIL PROTECTED] /etc/known_hosts2 )
+ [ -d /etc/ssh2/knownhosts ] &&
+@@ -3325,8 +3337,8 @@
+ {
+ local config
- if [ [EMAIL PROTECTED] -gt 0 ]; then
- # expand path (if present) to global known hosts file
-@@ -3448,7 +3452,7 @@
+- config=/etc/ssl/openssl.cnf
+- [ ! -f $config ] && config=/usr/share/ssl/openssl.cnf
++ [EMAIL PROTECTED]@/etc/ssl/openssl.cnf
++ [ ! -f $config ] && config=/System/Library/OpenSSL/openssl.cnf
+ 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 && {
_comp_dpkg_installed_packages()
{
@@ -194,7 +187,7 @@
grep -B 2 'ok installed' | grep "Package: $1" | cut -d\ -f2
}
-@@ -4137,6 +4141,7 @@
+@@ -4854,6 +4866,7 @@
# find the admin dir
for i in alternatives dpkg/alternatives rpm/alternatives; do
[ -d /var/lib/$i ] && admindir=/var/lib/$i && break
@@ -202,7 +195,7 @@
done
for (( i=1; i < COMP_CWORD; i++ )); do
if [[ "${COMP_WORDS[i]}" == --admindir ]]; then
-@@ -7222,6 +7227,7 @@
+@@ -8267,6 +8280,7 @@
\"${cur#[\`\"\']}\" 2>/dev/null ) \
$( compgen -d -- $cur ) )
}
@@ -211,8 +204,8 @@
$BASH_COMPLETION | \
# read exclusion compspecs
diff -uNr bash_completion/fink.sh bash_completion-new/fink.sh
---- 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
+--- 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
@@ -0,0 +1,128 @@
+#!/bin/bash
+
@@ -344,8 +337,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 18:00:00.000000000 -0600
-+++ bash_completion-new/open.sh 2004-11-04 16:41:46.000000000 -0600
+--- 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
@@ -0,0 +1,106 @@
+#!/bin/bash
+
Index: bash-completion.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/shells/bash-completion.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bash-completion.info 27 Apr 2005 03:26:37 -0000 1.1
+++ bash-completion.info 25 Aug 2005 18:16:13 -0000 1.2
@@ -1,8 +1,8 @@
Package: bash-completion
-Version: 20041017
+Version: 20050721
Revision: 1
Source: http://www.caliban.org/files/bash/%n-%v.tar.gz
-Source-MD5: b9f75cc7b11e5768d360f4a28f44067b
+Source-MD5: 08e5321ead7079c84822368d7a41deda
SourceDirectory: bash_completion
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: echo "none needed"
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
