From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 856F315800A for ; Mon, 31 Jul 2023 12:09:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7588E0CA5; Mon, 31 Jul 2023 12:09:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB6ADE0CA5 for ; Mon, 31 Jul 2023 12:09:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EEAB33BE99 for ; Mon, 31 Jul 2023 12:09:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D29FDC1 for ; Mon, 31 Jul 2023 12:09:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690805343.6ad5319033e13e9cf1a8372df7a91798c4c60f89.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/glusterfs/glusterfs-11.0.ebuild X-VCS-Directories: sys-cluster/glusterfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6ad5319033e13e9cf1a8372df7a91798c4c60f89 X-VCS-Branch: master Date: Mon, 31 Jul 2023 12:09:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ab96acd-c62d-422f-8852-36f3e922de2d X-Archives-Hash: 7bbd90ad3aa6139442b6d6e75e86589b commit: 6ad5319033e13e9cf1a8372df7a91798c4c60f89 Author: Sam James gentoo org> AuthorDate: Mon Jul 31 12:08:48 2023 +0000 Commit: Sam James gentoo 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 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 \