bash-completion: update to 2.5 (#5836)

This commit is contained in:
Alessio Sergi 2017-02-28 17:52:15 +01:00 committed by GitHub
parent 4ba6829d53
commit d862c02107
4 changed files with 8 additions and 41 deletions

View file

@ -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

View file

@ -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

View file

@ -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 <xtraeme@voidlinux.eu>"
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*
}

View file

@ -1 +0,0 @@
ignore="2008*"