From d862c02107fd042c6337c178f26ad98407d6d6af Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 28 Feb 2017 17:52:15 +0100 Subject: [PATCH] bash-completion: update to 2.5 (#5836) --- .../bash-completion/patches/openbsd-man.patch | 14 ----------- .../patches/words_bad_array_subscript.patch | 11 --------- srcpkgs/bash-completion/template | 23 +++++++------------ srcpkgs/bash-completion/update | 1 - 4 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/bash-completion/patches/openbsd-man.patch delete mode 100644 srcpkgs/bash-completion/patches/words_bad_array_subscript.patch delete mode 100644 srcpkgs/bash-completion/update diff --git a/srcpkgs/bash-completion/patches/openbsd-man.patch b/srcpkgs/bash-completion/patches/openbsd-man.patch deleted file mode 100644 index 148d875ed26..00000000000 --- a/srcpkgs/bash-completion/patches/openbsd-man.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- completions/man.orig -+++ completions/man -@@ -57,7 +57,10 @@ _man() - fi - - local manpath -- if [[ $OSTYPE == *@(darwin|linux|freebsd|cygwin)* ]] || _userland GNU; then -+ if [[ -r /etc/man.conf ]]; then -+ manpath=$(eval echo $(awk '/_default/ { print $2 }' /etc/man.conf)) -+ manpath=${manpath// /:} -+ elif [[ $OSTYPE == *@(darwin|linux|freebsd|cygwin)* ]] || _userland GNU; then - manpath=$( manpath 2>/dev/null || command man --path ) - else - manpath=$MANPATH diff --git a/srcpkgs/bash-completion/patches/words_bad_array_subscript.patch b/srcpkgs/bash-completion/patches/words_bad_array_subscript.patch deleted file mode 100644 index 25d6f743135..00000000000 --- a/srcpkgs/bash-completion/patches/words_bad_array_subscript.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bash_completion.orig -+++ bash_completion -@@ -718,7 +718,7 @@ _init_completion() - fi - done - -- [[ $cword -eq 0 ]] && return 1 -+ [[ $cword -le 0 ]] && return 1 - prev=${words[cword-1]} - - [[ ${split-} ]] && _split_longopt && split=true diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index b13df840b4a..e44eb68a3ca 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,27 +1,20 @@ # Template file for 'bash-completion' pkgname=bash-completion -version=2.1 -revision=8 -noarch="yes" +version=2.5 +revision=1 +noarch=yes build_style=gnu-configure +make_install_args="profiledir=/etc/bash/bashrc.d" makedepends="bash" depends="${makedepends}" short_desc="Programmable completion for the GNU Bash shell" maintainer="Juan RP " license="GPL-2" -homepage="http://bash-completion.alioth.debian.org/" -distfiles="http://${pkgname}.alioth.debian.org/files/${pkgname}-${version}.tar.bz2" -checksum=2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f +homepage="https://github.com/scop/bash-completion" +distfiles="${homepage}/releases/download/${version}/bash-completion-${version}.tar.xz" +checksum=b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf post_install() { # remove completions provided by util-linux. - for f in su dmesg ionice rtcwake look hexdump chsh renice hwclock mount umount \ - cal eject newgrp; do - rm -f ${DESTDIR}/usr/share/bash-completion/completions/${f} - done - # remove nmcli provided by NetworkManager. - rm -f ${DESTDIR}/usr/share/bash-completion/completions/nmcli - # move to bashrc.d to work after su - vmkdir /etc/bash/bashrc.d/ - mv ${DESTDIR}/etc/profile.d/bash_completion.sh ${DESTDIR}/etc/bash/bashrc.d/bash_completion.sh + rm -f ${DESTDIR}/usr/share/bash-completion/completions/{u,}mount* } diff --git a/srcpkgs/bash-completion/update b/srcpkgs/bash-completion/update deleted file mode 100644 index a772520058c..00000000000 --- a/srcpkgs/bash-completion/update +++ /dev/null @@ -1 +0,0 @@ -ignore="2008*"