[arch-commits] Commit in bash-completion/trunk (3 files)

[Dave Reisner]

Date: Tuesday, April 12, 2016 @ 14:28:43
  Author: dreisner
Revision: 264711

upgpkg: bash-completion 2.3-1

- drop backported fixes
- update upstream URL and source location
- remove umount/mount completions for compatibility with util-linux 2.28

Modified:
  bash-completion/trunk/PKGBUILD
Deleted:
  bash-completion/trunk/bash-completion-lz4.patch
  bash-completion/trunk/words_bad_array_subscript.patch

-+
 PKGBUILD|   27 +++
 bash-completion-lz4.patch   |   10 --
 words_bad_array_subscript.patch |   13 -
 3 files changed, 11 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-12 12:17:05 UTC (rev 264710)
+++ PKGBUILD2016-04-12 12:28:43 UTC (rev 264711)
@@ -2,30 +2,22 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=bash-completion
-pkgver=2.1
-pkgrel=5
+pkgver=2.3
+pkgrel=1
 pkgdesc="Programmable completion for the bash shell"
 arch=('any')
-url="http://bash-completion.alioth.debian.org/;
-license=('GPL')
+url="https://github.com/scop/bash-completion;
+license=('GPL2')
 depends=('bash')
 options=('!emptydirs' '!makeflags')
-#http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2
-source=('http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=snapshot;h=867282a7341ccfff9a0e8a8ef6bba6e781b66afb;sf=tgz'
-bash-4.3.patch bash-completion-lz4.patch 
words_bad_array_subscript.patch)
-sha1sums=('153a8d056d0f5cdc22477ebfa13c1a461ff95556'
-  'd2a01350990c1221bd53d55edf31210c74d02bca'
-  'a8cdbadacdce845ec69575e1046c197d54e64074'
-  'ae1d9a334e4908464b339f929dd5874c2af11bd2')
+source=("https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz;
+'bash-4.3.patch')
+sha1sums=('6b42d6747dab48bdc983627e8ce69283ff0e6b79'
+  'd2a01350990c1221bd53d55edf31210c74d02bca')
 
 prepare() {
-  rm -rf ${pkgname}-${pkgver}
-  mv ${pkgname}-867282a ${pkgname}-${pkgver}
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../bash-4.3.patch
-  patch -p0 -i ../bash-completion-lz4.patch
-  patch -p1 -i ../words_bad_array_subscript.patch
-  autoreconf --install
 }
 
 build() {
@@ -43,4 +35,7 @@
 
 # remove Slackware's makepkg completion
   rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
+
+# remove completions which overlap with util-linux
+  rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount
 }

Deleted: bash-completion-lz4.patch
===
--- bash-completion-lz4.patch   2016-04-12 12:17:05 UTC (rev 264710)
+++ bash-completion-lz4.patch   2016-04-12 12:28:43 UTC (rev 264711)
@@ -1,10 +0,0 @@
 completions/Makefile.am.orig   2014-03-20 19:31:07.341541256 -0400
-+++ completions/Makefile.am2014-03-20 19:31:33.357950340 -0400
-@@ -195,6 +195,7 @@
-   luseradd \
-   luserdel \
-   lvm \
-+  lz4 \
-   lzip \
-   lzma \
-   lzop \

Deleted: words_bad_array_subscript.patch
===
--- words_bad_array_subscript.patch 2016-04-12 12:17:05 UTC (rev 264710)
+++ words_bad_array_subscript.patch 2016-04-12 12:28:43 UTC (rev 264711)
@@ -1,13 +0,0 @@
-diff --git a/bash_completion b/bash_completion
-index 66d36b1..ce469d0 100644
 a/bash_completion
-+++ b/bash_completion
-@@ -707,7 +707,7 @@ _init_completion()
- fi
- done
- 
--[[ $cword -eq 0 ]] && return 1
-+[[ $cword -le 0 ]] && return 1
- prev=${words[cword-1]}
- 
- [[ ${split-} ]] && _split_longopt && split=true

[arch-commits] Commit in bash-completion/trunk (3 files)

[Eric Bélanger]

Date: Saturday, February 6, 2010 @ 04:38:37
  Author: eric
Revision: 67317

upgpkg: bash-completion 1.1-3
Fixed cowsay completion (close FS#17421), Removed old patch

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

--+
 PKGBUILD |8 +---
 cowsay.bashcomp  |   34 ++
 fix-_filedir-on-bash-4.patch |   28 
 3 files changed, 39 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-06 09:14:43 UTC (rev 67316)
+++ PKGBUILD2010-02-06 09:38:37 UTC (rev 67317)
@@ -5,14 +5,15 @@
 
 pkgname=bash-completion
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc=Programmable completion for the bash shell
 arch=(any)
 url=http://bash-completion.alioth.debian.org/;
 license=('GPL')
 depends=('bash')
-source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('53369b32493b58c3d0d7d45630c329faa3ca209ed6e7a6c5392a19e67904721b')
+source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz 
cowsay.bashcomp)
+md5sums=('593d3edcf287b9e9d735049bd4d3f229' 'e9766bdc391caf825cb24e704422987e')
+sha1sums=('0e666ebda3d577571ab62bcecc16e1024922cd18' 
'a8620aa1029d46bae92be8a6ea0eb62d737545ef')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -23,6 +24,7 @@
   ./configure --prefix=/usr --sysconfdir=/etc
   make || return 1
   make DESTDIR=$pkgdir install
+  install -D -m644 $srcdir/cowsay.bashcomp 
$pkgdir/etc/bash_completion.d/cowsay
 
   # apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
   rm $pkgdir/etc/bash_completion.d/apache2ctl

Added: cowsay.bashcomp
===
--- cowsay.bashcomp (rev 0)
+++ cowsay.bashcomp 2010-02-06 09:38:37 UTC (rev 67317)
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/games-misc/cowsay/files/cowsay.bashcomp,v
 1.1 2005/02/06 14:37:54 ka0ttic Exp $
+
+# bash command-line completion for cowsay
+# Author: Aaron Walker ka0t...@gentoo.org
+# Modified by: Michal Bentkowski mr.ecik at gmail.com
+
+_cowsay() {
+local cur prev opts x
+COMPREPLY=()
+cur=${COMP_WORDS[COMP_CWORD]}
+prev=${COMP_WORDS[COMP_CWORD-1]}
+opts=-e -f -h -l -n -T -W -b -d -g -p -s -t -w -y
+
+if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+COMPREPLY=( $(compgen -W ${opts} -- ${cur}) )
+return 0
+fi
+
+case ${prev} in
+-f)
+COMPREPLY=( $( command ls /usr/share/cowsay| \
+sed -ne 's/^\('$cur'.*\)\.cow$/\1/p') )
+return 0
+;;
+-[eTW])
+COMPREPLY=()
+;;
+esac
+}
+complete -o filenames -F _cowsay cowsay cowthink
+
+# vim: set ft=sh tw=80 sw=4 et :

Deleted: fix-_filedir-on-bash-4.patch
===
--- fix-_filedir-on-bash-4.patch2010-02-06 09:14:43 UTC (rev 67316)
+++ fix-_filedir-on-bash-4.patch2010-02-06 09:38:37 UTC (rev 67317)
@@ -1,28 +0,0 @@
-commit 1421e55aac075e13491cd212b796bdd453214a2c
-Author: Mike Kelly pi...@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
- }