[arch-commits] Commit in bash-completion/repos/extra-any (7 files)
Eric Bélanger
eric at nymeria.archlinux.org
Wed Apr 23 01:13:09 UTC 2014
Date: Wednesday, April 23, 2014 @ 03:13:09
Author: eric
Revision: 211666
archrelease: copy trunk to extra-any
Added:
bash-completion/repos/extra-any/PKGBUILD
(from rev 211665, bash-completion/trunk/PKGBUILD)
bash-completion/repos/extra-any/bash-4.3.patch
(from rev 211665, bash-completion/trunk/bash-4.3.patch)
bash-completion/repos/extra-any/bash-completion-lz4.patch
(from rev 211665, bash-completion/trunk/bash-completion-lz4.patch)
bash-completion/repos/extra-any/words_bad_array_subscript.patch
(from rev 211665, bash-completion/trunk/words_bad_array_subscript.patch)
Deleted:
bash-completion/repos/extra-any/PKGBUILD
bash-completion/repos/extra-any/bash-4.3.patch
bash-completion/repos/extra-any/bash-completion-lz4.patch
---------------------------------+
PKGBUILD | 90 +++++++++++++++++++-------------------
bash-4.3.patch | 54 +++++++++++-----------
bash-completion-lz4.patch | 20 ++++----
words_bad_array_subscript.patch | 13 +++++
4 files changed, 96 insertions(+), 81 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-23 01:12:31 UTC (rev 211665)
+++ PKGBUILD 2014-04-23 01:13:09 UTC (rev 211666)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=bash-completion
-pkgver=2.1
-pkgrel=4
-pkgdesc="Programmable completion for the bash shell"
-arch=('any')
-url="http://bash-completion.alioth.debian.org/"
-license=('GPL')
-depends=('bash')
-options=('!emptydirs' '!makeflags')
-source=('http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=snapshot;h=867282a7341ccfff9a0e8a8ef6bba6e781b66afb;sf=tgz'
-#http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2
- bash-4.3.patch bash-completion-lz4.patch)
-md5sums=('3b0ea5f328c228c570ee391b4faed06a'
- 'f964553680d88a89dbe8a7275e94bd3b'
- '54a801a7a2b7aaae6ad7b3b6419003fe')
-
-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
- autoreconf --install
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd ${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"
-
-# remove Slackware's makepkg completion
- rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
-}
Copied: bash-completion/repos/extra-any/PKGBUILD (from rev 211665, bash-completion/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-04-23 01:13:09 UTC (rev 211666)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=bash-completion
+pkgver=2.1
+pkgrel=5
+pkgdesc="Programmable completion for the bash shell"
+arch=('any')
+url="http://bash-completion.alioth.debian.org/"
+license=('GPL')
+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')
+
+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() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd ${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"
+
+# remove Slackware's makepkg completion
+ rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
+}
Deleted: bash-4.3.patch
===================================================================
--- bash-4.3.patch 2014-04-23 01:12:31 UTC (rev 211665)
+++ bash-4.3.patch 2014-04-23 01:13:09 UTC (rev 211666)
@@ -1,27 +0,0 @@
---- a/bash_completion 2014-03-09 17:38:14 +0000
-+++ b/bash_completion 2014-03-13 23:26:44 +0000
-@@ -536,13 +536,23 @@
- # @param $2 Name of variable to return result to
- _quote_readline_by_ref()
- {
-- if [[ $1 == \'* ]]; then
-+ if [ -z "$1" ]; then
-+ # avoid quoting if empty
-+ printf -v $2 %s "$1"
-+ elif [[ $1 == \'* ]]; then
- # Leave out first character
- printf -v $2 %s "${1:1}"
-+ elif [[ $1 == ~* ]]; then
-+ # avoid escaping first ~
-+ printf -v $2 ~%q "${1:1}"
- else
- printf -v $2 %q "$1"
- fi
-
-+ # Replace double escaping ( \\ ) by single ( \ )
-+ # This happens always when argument is already escaped at cmdline,
-+ # and passed to this function as e.g.: file\ with\ spaces
-+ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
- # If result becomes quoted like this: $'string', re-evaluate in order to
- # drop the additional quoting. See also: http://www.mail-archive.com/
- # bash-completion-devel at lists.alioth.debian.org/msg01942.html
Copied: bash-completion/repos/extra-any/bash-4.3.patch (from rev 211665, bash-completion/trunk/bash-4.3.patch)
===================================================================
--- bash-4.3.patch (rev 0)
+++ bash-4.3.patch 2014-04-23 01:13:09 UTC (rev 211666)
@@ -0,0 +1,27 @@
+--- a/bash_completion 2014-03-09 17:38:14 +0000
++++ b/bash_completion 2014-03-13 23:26:44 +0000
+@@ -536,13 +536,23 @@
+ # @param $2 Name of variable to return result to
+ _quote_readline_by_ref()
+ {
+- if [[ $1 == \'* ]]; then
++ if [ -z "$1" ]; then
++ # avoid quoting if empty
++ printf -v $2 %s "$1"
++ elif [[ $1 == \'* ]]; then
+ # Leave out first character
+ printf -v $2 %s "${1:1}"
++ elif [[ $1 == ~* ]]; then
++ # avoid escaping first ~
++ printf -v $2 ~%q "${1:1}"
+ else
+ printf -v $2 %q "$1"
+ fi
+
++ # Replace double escaping ( \\ ) by single ( \ )
++ # This happens always when argument is already escaped at cmdline,
++ # and passed to this function as e.g.: file\ with\ spaces
++ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
+ # If result becomes quoted like this: $'string', re-evaluate in order to
+ # drop the additional quoting. See also: http://www.mail-archive.com/
+ # bash-completion-devel at lists.alioth.debian.org/msg01942.html
Deleted: bash-completion-lz4.patch
===================================================================
--- bash-completion-lz4.patch 2014-04-23 01:12:31 UTC (rev 211665)
+++ bash-completion-lz4.patch 2014-04-23 01:13:09 UTC (rev 211666)
@@ -1,10 +0,0 @@
---- completions/Makefile.am.orig 2014-03-20 19:31:07.341541256 -0400
-+++ completions/Makefile.am 2014-03-20 19:31:33.357950340 -0400
-@@ -195,6 +195,7 @@
- luseradd \
- luserdel \
- lvm \
-+ lz4 \
- lzip \
- lzma \
- lzop \
Copied: bash-completion/repos/extra-any/bash-completion-lz4.patch (from rev 211665, bash-completion/trunk/bash-completion-lz4.patch)
===================================================================
--- bash-completion-lz4.patch (rev 0)
+++ bash-completion-lz4.patch 2014-04-23 01:13:09 UTC (rev 211666)
@@ -0,0 +1,10 @@
+--- completions/Makefile.am.orig 2014-03-20 19:31:07.341541256 -0400
++++ completions/Makefile.am 2014-03-20 19:31:33.357950340 -0400
+@@ -195,6 +195,7 @@
+ luseradd \
+ luserdel \
+ lvm \
++ lz4 \
+ lzip \
+ lzma \
+ lzop \
Copied: bash-completion/repos/extra-any/words_bad_array_subscript.patch (from rev 211665, bash-completion/trunk/words_bad_array_subscript.patch)
===================================================================
--- words_bad_array_subscript.patch (rev 0)
+++ words_bad_array_subscript.patch 2014-04-23 01:13:09 UTC (rev 211666)
@@ -0,0 +1,13 @@
+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
More information about the arch-commits
mailing list