commit: 6ad5319033e13e9cf1a8372df7a91798c4c60f89 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 31 12:08:48 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 31 12:09:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad53190
sys-cluster/glusterfs: always install bash-completion manually I wanted to do a very quick hacky fix in 03b9c8a35924f482ff41b1418c9ab13979fd1c99, but here's the better one. Bug: https://bugs.gentoo.org/911523 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-cluster/glusterfs/glusterfs-11.0.ebuild | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys-cluster/glusterfs/glusterfs-11.0.ebuild b/sys-cluster/glusterfs/glusterfs-11.0.ebuild index eb29d14d963a..d20ce8ba2b97 100644 --- a/sys-cluster/glusterfs/glusterfs-11.0.ebuild +++ b/sys-cluster/glusterfs/glusterfs-11.0.ebuild @@ -123,16 +123,11 @@ src_test() { } src_install() { - local bashcompdir=$(get_bashcompdir) - bashcompdir="${bashcompdir}" default - - # XXX: Quick hack to fix bug #911523 - if [[ -f "${ED}"/${bashcompdir}/gluster.bash ]] ; then - mv "${ED}/${bashcompdir}/gluster.bash" "${ED}/${bashcompdir}/gluster" || die - else - newbashcomp "${ED}"/etc/bash_completion.d/gluster.bash ${PN} - rm -rf "${ED}"/etc/bash_completion.d || die - fi + default + + # Path changes based on whether app-shells/bash-completion is installed, bug #911523 + rm -rf "${ED}"/etc/bash_completion.d || die + newbashcomp extras/command-completion/gluster.bash ${PN} rm \ "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
