Author: ranger
Date: Mon Jan 14 22:04:17 2008
New Revision: 1107
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1107&repname=user%3a+ranger
Log:
fix for bash 3
Modified:
trunk/experimental/common/main/finkinfo/shells/bash-completion.info
trunk/experimental/common/main/finkinfo/shells/bash-completion.patch
Modified: trunk/experimental/common/main/finkinfo/shells/bash-completion.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/shells/bash-completion.info&rev=1107&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/shells/bash-completion.info
(original)
+++ trunk/experimental/common/main/finkinfo/shells/bash-completion.info Mon Jan
14 22:04:17 2008
@@ -1,6 +1,6 @@
Package: bash-completion
Version: 20060301
-Revision: 2
+Revision: 3
Source: http://www.caliban.org/files/bash/%n-%v.tar.gz
Source-MD5: 9bca1cf97e8f8c73e3ef560cc9dead21
SourceDirectory: bash_completion
Modified: trunk/experimental/common/main/finkinfo/shells/bash-completion.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/shells/bash-completion.patch&rev=1107&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/shells/bash-completion.patch
(original)
+++ trunk/experimental/common/main/finkinfo/shells/bash-completion.patch Mon
Jan 14 22:04:17 2008
@@ -1,24 +1,30 @@
-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 2006-12-13 11:56:42.000000000
-0500
-@@ -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
+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 2006-12-13 12:06:04.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
@@ -329,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 2006-12-13 11:56:42.000000000 -0500
++++ bash_completion-new/fink.sh 2008-01-14 15:51:52.000000000 -0500
@@ -0,0 +1,128 @@
+#!/bin/bash
+
@@ -462,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 2006-12-13 11:56:42.000000000 -0500
++++ bash_completion-new/open.sh 2008-01-14 15:51:52.000000000 -0500
@@ -0,0 +1,106 @@
+#!/bin/bash
+
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
