[arch-commits] Commit in bash-completion/trunk (PKGBUILD fix-_filedir-on-bash-4.patch)

[Aaron Griffin]

    Date: Monday, June 29, 2009 @ 13:56:13
  Author: aaron
Revision: 43692

upgpkg: bash-completion 1.0-2
    Fix FS#15310 and FS#15312 with a patch from bash_completion.git

Added:
  bash-completion/trunk/fix-_filedir-on-bash-4.patch
Modified:
  bash-completion/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   14 ++++++++++----
 fix-_filedir-on-bash-4.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-29 13:51:44 UTC (rev 43691)
+++ PKGBUILD	2009-06-29 17:56:13 UTC (rev 43692)
@@ -5,14 +5,18 @@
 
 pkgname=bash-completion
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Programmable completion for the bash shell"
 arch=(i686 x86_64)
 url="http://bash-completion.alioth.debian.org/"
 license=('GPL')
 depends=('bash')
-source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz)
-md5sums=('cd1c5648272917fbe0eef4ba30bb93f4')
+source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz
+        bash_completion.sh
+        fix-_filedir-on-bash-4.patch)
+md5sums=('cd1c5648272917fbe0eef4ba30bb93f4'
+         'b02622e759e01b2077617ddfc51cbe43'
+         '1c707436109fb4c80ef7abeefc7dd1b0')
 options=('force')
 
 build() {
@@ -21,6 +25,8 @@
   # fixes for archlinux
   sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1
 
+  patch -up1 < $srcdir/fix-_filedir-on-bash-4.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc
   make || return 1
   make DESTDIR="$pkgdir" install
@@ -28,6 +34,6 @@
   # apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
   rm "$pkgdir/etc/bash_completion.d/apache2ctl"
 
-  install -Dm755 bash_completion.sh "$pkgdir/etc/profile.d/bash_completion.sh"
+  install -Dm755 "$srcdir/bash_completion.sh" "$pkgdir/etc/profile.d/bash_completion.sh"
 }
 # vim:set ts=2 sw=2 et:

Added: fix-_filedir-on-bash-4.patch
===================================================================
--- fix-_filedir-on-bash-4.patch	                        (rev 0)
+++ fix-_filedir-on-bash-4.patch	2009-06-29 17:56:13 UTC (rev 43692)
@@ -0,0 +1,28 @@
+commit 1421e55aac075e13491cd212b796bdd453214a2c
+Author: Mike Kelly <pioto at pioto.org>
+Date:   Thu Apr 2 11:16:46 2009 -0400
+
+    Fix _filedir on bash 4.
+    
+    We don't need to double-quote things for compgen w/ bash 4. Just putting
+    each file in double quotes is sufficient.
+    
+    See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
+
+diff --git a/bash_completion b/bash_completion
+index 0246cd8..4d21cf8 100644
+--- a/bash_completion
++++ b/bash_completion
+@@ -209,6 +209,12 @@ quote()
+ # results in the original argument
+ quote_readline()
+ {
++	if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then
++		# This function isn't really necessary on bash 4
++		# See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html
++		echo "${1}"
++		return
++	fi
+ 	local t="${1//\\/\\\\}"
+ 	echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting
+ }