[arch-commits] Commit in bash-completion/trunk (PKGBUILD cowsay.bashcomp)

[Eric Bélanger]

    Date: Monday, July 5, 2010 @ 21:18:59
  Author: eric
Revision: 84968

upgpkg: bash-completion 1.2-1
Upstream update

Modified:
  bash-completion/trunk/PKGBUILD
Deleted:
  bash-completion/trunk/cowsay.bashcomp

-----------------+
 PKGBUILD        |   26 ++++++++++++--------------
 cowsay.bashcomp |   34 ----------------------------------
 2 files changed, 12 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-05 23:28:37 UTC (rev 84967)
+++ PKGBUILD	2010-07-06 01:18:59 UTC (rev 84968)
@@ -4,31 +4,29 @@
 # Contributor: Evangelos Foutras <foutrelis at gmail.com>
 
 pkgname=bash-completion
-pkgver=1.1
-pkgrel=3
+pkgver=1.2
+pkgrel=1
 pkgdesc="Programmable completion for the bash shell"
-arch=(any)
+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 cowsay.bashcomp)
-md5sums=('593d3edcf287b9e9d735049bd4d3f229' 'e9766bdc391caf825cb24e704422987e')
-sha1sums=('0e666ebda3d577571ab62bcecc16e1024922cd18' 'a8620aa1029d46bae92be8a6ea0eb62d737545ef')
+source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.bz2)
+md5sums=('88c022a98a02a02293716f840eadd884')
+sha1sums=('47e6fb919ae227e74172870379b0fe999a2ae70d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # fixes for archlinux
-  sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1
+  sed -i 's#/sbin" lsmod#/bin" lsmod#' bash_completion
 
   ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/cowsay.bashcomp" "$pkgdir/etc/bash_completion.d/cowsay"
+  make
+}
 
-  # apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
-  rm "$pkgdir/etc/bash_completion.d/apache2ctl"
-  # munin-node doesn't work, even i've updated munin to 1.4.0
-  rm "$pkgdir/etc/bash_completion.d/munin-node"
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
 # vim:set ts=2 sw=2 et:

Deleted: cowsay.bashcomp
===================================================================
--- cowsay.bashcomp	2010-07-05 23:28:37 UTC (rev 84967)
+++ cowsay.bashcomp	2010-07-06 01:18:59 UTC (rev 84968)
@@ -1,34 +0,0 @@
-# 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 <ka0ttic at 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 :