Date: Tuesday, April 12, 2016 @ 20:16:35 Author: dreisner Revision: 264733
archrelease: copy trunk to testing-any Added: bash-completion/repos/testing-any/PKGBUILD (from rev 264732, bash-completion/trunk/PKGBUILD) bash-completion/repos/testing-any/bash-4.3.patch (from rev 264732, bash-completion/trunk/bash-4.3.patch) Deleted: bash-completion/repos/testing-any/PKGBUILD bash-completion/repos/testing-any/bash-4.3.patch ----------------+ PKGBUILD | 85 ++++++++++++++++++++++++++++--------------------------- bash-4.3.patch | 54 +++++++++++++++++----------------- 2 files changed, 71 insertions(+), 68 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-04-12 18:16:18 UTC (rev 264732) +++ PKGBUILD 2016-04-12 18:16:35 UTC (rev 264733) @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=bash-completion -pkgver=2.3 -pkgrel=1 -pkgdesc="Programmable completion for the bash shell" -arch=('any') -url="https://github.com/scop/bash-completion" -license=('GPL2') -depends=('bash') -options=('!emptydirs' '!makeflags') -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() { - cd ${pkgname}-${pkgver} - patch -p1 -i ../bash-4.3.patch -} - -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" - -# remove completions which overlap with util-linux - rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount -} Copied: bash-completion/repos/testing-any/PKGBUILD (from rev 264732, bash-completion/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-04-12 18:16:35 UTC (rev 264733) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=bash-completion +pkgver=2.3 +pkgrel=2 +pkgdesc="Programmable completion for the bash shell" +arch=('any') +url="https://github.com/scop/bash-completion" +license=('GPL2') +depends=('bash') +options=('!emptydirs' '!makeflags') +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() { + cd ${pkgname}-${pkgver} + patch -p1 -i ../bash-4.3.patch +} + +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" + +# remove completions which overlap with util-linux + rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount + +# remove completions provided by android-tools + rm "${pkgdir}/usr/share/bash-completion/completions"/adb +} Deleted: bash-4.3.patch =================================================================== --- bash-4.3.patch 2016-04-12 18:16:18 UTC (rev 264732) +++ bash-4.3.patch 2016-04-12 18:16:35 UTC (rev 264733) @@ -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-de...@lists.alioth.debian.org/msg01942.html Copied: bash-completion/repos/testing-any/bash-4.3.patch (from rev 264732, bash-completion/trunk/bash-4.3.patch) =================================================================== --- bash-4.3.patch (rev 0) +++ bash-4.3.patch 2016-04-12 18:16:35 UTC (rev 264733) @@ -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-de...@lists.alioth.debian.org/msg01942.html