Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/shells
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23580/common/main/finkinfo/shells
Modified Files:
bash-completion.info bash-completion.patch
Log Message:
lotsa updates
Index: bash-completion.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/shells/bash-completion.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bash-completion.patch 31 Jan 2005 23:17:05 -0000 1.7
+++ bash-completion.patch 25 Aug 2005 18:12:48 -0000 1.8
@@ -1,6 +1,6 @@
diff -uNr bash_completion/bash-completion.sh
bash_completion-new/bash-completion.sh
---- bash_completion/bash-completion.sh Wed Dec 31 19:00:00 1969
-+++ bash_completion-new/bash-completion.sh Sat Jan 29 13:32:10 2005
+--- 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,28 +17,20 @@
+ unset bash bmajor bminor
+fi
diff -uNr bash_completion/bash_completion bash_completion-new/bash_completion
---- bash_completion/bash_completion Fri Jan 21 17:29:49 2005
-+++ bash_completion-new/bash_completion Sat Jan 29 13:35:32 2005
-@@ -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
-@@ -168,7 +168,7 @@
+@@ -167,7 +167,7 @@
# use GNU sed if we have it, since its extensions are still used in our code
#
@@ -47,7 +39,7 @@
# This function checks whether a given readline variable
# is `on'.
-@@ -220,7 +220,9 @@
+@@ -224,7 +224,9 @@
#
_configured_interfaces()
{
@@ -69,7 +61,7 @@
COMPREPLY=( $( builtin echo
$sysvdir/!(*.rpmsave|*.rpmorig|*~|functions)) )
if [ -d $famdir ]; then
-@@ -500,7 +502,7 @@
+@@ -528,7 +530,7 @@
# 'service' command and/or the SysV init.d directory, followed by
# that script's available commands
#
@@ -78,7 +70,7 @@
_service()
{
local cur sysvdir
-@@ -516,8 +518,8 @@
+@@ -544,8 +546,8 @@
# don't complete past 2nd token
[ $COMP_CWORD -gt 2 ] && return 0
@@ -89,10 +81,10 @@
if [[ $COMP_CWORD -eq 1 ]] && [[ $prev == "service" ]]; then
_services
-@@ -530,8 +532,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 \
@@ -100,7 +92,7 @@
# chown(1) completion
#
-@@ -828,7 +830,7 @@
+@@ -850,7 +852,7 @@
# Linux and FreeBSD killall(1) completion.
#
@@ -109,7 +101,7 @@
_killall()
{
local cur
-@@ -846,7 +848,7 @@
+@@ -868,7 +870,7 @@
return 0
}
@@ -118,7 +110,7 @@
# Linux and FreeBSD pgrep(1) completion.
#
-@@ -1961,7 +1963,7 @@
+@@ -2006,7 +2008,7 @@
if [ -n "$special" ]; then
case $special in
remove)
@@ -127,7 +119,7 @@
# Debian system
COMPREPLY=( $( _comp_dpkg_installed_packages \
$cur ) )
-@@ -2098,7 +2100,7 @@
+@@ -2143,7 +2145,7 @@
have aptitude && {
_comp_dpkg_hold_packages()
{
@@ -136,7 +128,7 @@
| cut -d\ -f2
}
-@@ -2259,7 +2261,7 @@
+@@ -2304,7 +2306,7 @@
prev=${COMP_WORDS[COMP_CWORD-1]}
if [ "$prev" = "-s" ]; then
@@ -145,7 +137,7 @@
COMPREPLY=( $( </etc/shells ) )
else
COMPREPLY=( $( chsh -l | grep "^$cur" ) )
-@@ -2342,6 +2344,8 @@
+@@ -2387,6 +2389,8 @@
kh=()
# ssh config files
@@ -154,7 +146,7 @@
[ -r /etc/ssh/ssh_config ] &&
config=( [EMAIL PROTECTED] /etc/ssh/ssh_config )
[ -r ~/.ssh/config ] &&
-@@ -2360,12 +2364,20 @@
+@@ -2405,12 +2409,20 @@
if [ -r "$global_kh" ]; then
kh=( "$global_kh" )
else
@@ -175,7 +167,18 @@
[ -r /etc/known_hosts2 ] &&
kh=( [EMAIL PROTECTED] /etc/known_hosts2 )
[ -d /etc/ssh2/knownhosts ] &&
-@@ -4118,7 +4130,7 @@
+@@ -3325,8 +3337,8 @@
+ {
+ local config
+
+- 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()
{
@@ -184,7 +187,7 @@
grep -B 2 'ok installed' | grep "Package: $1" | cut -d\ -f2
}
-@@ -4807,6 +4819,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
@@ -192,7 +195,7 @@
done
for (( i=1; i < COMP_CWORD; i++ )); do
if [[ "${COMP_WORDS[i]}" == --admindir ]]; then
-@@ -7993,6 +8006,7 @@
+@@ -8267,6 +8280,7 @@
\"${cur#[\`\"\']}\" 2>/dev/null ) \
$( compgen -d -- $cur ) )
}
@@ -201,8 +204,8 @@
$BASH_COMPLETION | \
# read exclusion compspecs
diff -uNr bash_completion/fink.sh bash_completion-new/fink.sh
---- bash_completion/fink.sh Wed Dec 31 19:00:00 1969
-+++ bash_completion-new/fink.sh Sat Jan 29 13:32:10 2005
+--- 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
+
@@ -334,8 +337,8 @@
+}
\ No newline at end of file
diff -uNr bash_completion/open.sh bash_completion-new/open.sh
---- bash_completion/open.sh Wed Dec 31 19:00:00 1969
-+++ bash_completion-new/open.sh Sat Jan 29 13:32:10 2005
+--- 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/experimental/rangerrick/common/main/finkinfo/shells/bash-completion.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bash-completion.info 31 Jan 2005 23:17:05 -0000 1.8
+++ bash-completion.info 25 Aug 2005 18:12:48 -0000 1.9
@@ -1,8 +1,8 @@
Package: bash-completion
-Version: 20050121
+Version: 20050721
Revision: 1
Source: http://www.caliban.org/files/bash/%n-%v.tar.gz
-Source-MD5: ca8b557b62d4af341f565830d7b25b4f
+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
