[arch-commits] Commit in bash-completion/repos (4 files)

Eric Bélanger eric at archlinux.org
Tue Mar 20 22:16:45 EDT 2012


    Date: Tuesday, March 20, 2012 @ 22:16:45
  Author: eric
Revision: 153953

db-move: moved bash-completion from [testing] to [extra] (any)

Added:
  bash-completion/repos/extra-any/PKGBUILD
    (from rev 153952, bash-completion/repos/testing-any/PKGBUILD)
  bash-completion/repos/extra-any/modinfo-path.diff
    (from rev 153952, bash-completion/repos/testing-any/modinfo-path.diff)
Deleted:
  bash-completion/repos/extra-any/PKGBUILD
  bash-completion/repos/testing-any/

-------------------+
 PKGBUILD          |   61 ++++++++++++++++++++++++++--------------------------
 modinfo-path.diff |   15 ++++++++++++
 2 files changed, 46 insertions(+), 30 deletions(-)

Deleted: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2012-03-21 02:16:32 UTC (rev 153952)
+++ extra-any/PKGBUILD	2012-03-21 02:16:45 UTC (rev 153953)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=bash-completion
-pkgver=1.3
-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.bz2")
-sha1sums=('6a46b93f44c56cc336632ab28d90c0595fbcc98f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it
-  rm -r "${pkgdir}/etc/profile.d"
-# Doesn't work on Arch Linux and cause problems (FS#20112)
-  rm "${pkgdir}/etc/bash_completion.d/service"
-}

Copied: bash-completion/repos/extra-any/PKGBUILD (from rev 153952, bash-completion/repos/testing-any/PKGBUILD)
===================================================================
--- extra-any/PKGBUILD	                        (rev 0)
+++ extra-any/PKGBUILD	2012-03-21 02:16:45 UTC (rev 153953)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=bash-completion
+pkgver=1.99
+pkgrel=1
+pkgdesc="Programmable completion for the bash shell"
+arch=('any')
+url="http://bash-completion.alioth.debian.org/"
+license=('GPL')
+depends=('bash')
+options=('!emptydirs')
+source=(http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2 \
+        modinfo-path.diff)
+md5sums=('3cf478b7f1065f424d3d6ec35f80e4f2'
+         '7047eb6f484323e8d1d22fb260a43a8e')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/modinfo-path.diff"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it
+  rm "${pkgdir}/etc/profile.d/bash_completion.sh"
+}

Copied: bash-completion/repos/extra-any/modinfo-path.diff (from rev 153952, bash-completion/repos/testing-any/modinfo-path.diff)
===================================================================
--- extra-any/modinfo-path.diff	                        (rev 0)
+++ extra-any/modinfo-path.diff	2012-03-21 02:16:45 UTC (rev 153953)
@@ -0,0 +1,15 @@
+Subject: [PATCH 1/1] insmod, modprobe: Don't hardcode path to modinfo (Alioth: #313569)
+
+--- a/completions/insmod
++++ b/completions/insmod
+@@ -9,8 +9,8 @@ _insmod()
+ 
+     if [[ $cword -gt 1 && "${words[cword-1]}" != -* ]]; then
+         # do module parameter completion
+-        COMPREPLY=( $( compgen -W "$( /sbin/modinfo -p ${words[1]} | \
+-            cut -d: -f1 )" -- "$cur" ) )
++        COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" modinfo \
++            -p ${words[1]} 2>/dev/null | cut -d: -f1 )" -- "$cur" ) )
+     else
+         _modules $(uname -r)
+     fi



More information about the arch-commits mailing list