testing/*: remove usage of shell-completion functions

instead we use the ones provided to us by abuild itself

8 files changed, 21 insertions, 51 deletions

diff --git a/testing/createrepo_c/APKBUILD b/testing/createrepo_c/APKBUILD
index e36e3e9928d..8286308e4f5 100644
--- a/testing/createrepo_c/APKBUILD
+++ b/testing/createrepo_c/APKBUILD
@@ -30,7 +30,7 @@ checkdepends="
 	xz
 	"
 subpackages="
-	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-bash-completion
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-libs
@@ -83,14 +83,5 @@ py3() {
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="${pkgname}=$pkgver-r${pkgrel} bash-completion"
-
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share/
-}
-
 sha512sums="8a20bda92338db87f8ac27a6c3e191f6ac63a6be0e77bdc3227143acc2eb5b4fe06f6fdbb13b2031f69555c7f8a053d6155e4515620724515b173bd546648f1f  createrepo_c-0.15.7.tar.gz
 d10bcc42c89931c386757967d8ee1eb381bc97f2f450cf9c8c244eaf8c58602a26899257d112c65b24c63faf807981e63fa8edc9bbe1f451fb6c30fde8dedcbc  disable-failing-tests.patch"
diff --git a/testing/crosstool-ng/APKBUILD b/testing/crosstool-ng/APKBUILD
index 4d9914900eb..9cdf776ec1d 100644
--- a/testing/crosstool-ng/APKBUILD
+++ b/testing/crosstool-ng/APKBUILD
@@ -8,7 +8,7 @@ license="LGPL-2.1-or-later GPL-2.0-or-later CC-BY-SA-2.5"
 arch="x86 x86_64 ppc64le"
 depends="bash gawk bison flex automake autoconf libtool cvs sed texinfo gperf"
 makedepends="ncurses-dev help2man xz gettext-dev"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion"
 source="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-$pkgver.tar.xz"
 
 builddir="$srcdir/$pkgname-$pkgver"
@@ -25,17 +25,11 @@ build() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-	# bash completion has it's own package
-	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions/
+	# bash completion
+	mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
 	mv "$pkgdir"/usr/share/bash-completion/completions/ct-ng \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
+		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 }
 
 sha512sums="89b8794a4184ad4928750e29712ed4f194aa1d0b93768d67ff64f30c30f1b1e165647cafc6de94d68d3ef70e50446e544dad65aa36137511a32ee7a667dddfb4  crosstool-ng-1.24.0.tar.xz"
diff --git a/testing/datamash/APKBUILD b/testing/datamash/APKBUILD
index 9b90204feaa..99de7931ed5 100644
--- a/testing/datamash/APKBUILD
+++ b/testing/datamash/APKBUILD
@@ -8,7 +8,7 @@ url="https://www.gnu.org/software/datamash/"
 arch="all"
 license="GPL-3.0-or-later"
 source="https://ftpmirror.gnu.org/datamash/datamash-$pkgver.tar.gz"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion"
 
 build() {
 	./configure \
@@ -31,16 +31,10 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/usr/share/datamash/examples \
 		"$pkgdir"/usr/lib/charset.alias
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions/
+	mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
 	mv "$pkgdir"/usr/share/datamash/bash-completion.d/datamash \
-		"$subpkgdir"/usr/share/bash-completion/completions/
+		"$pkgdir"/usr/share/bash-completion/completions/
 	rm -r "$pkgdir"/usr/share/datamash/bash-completion.d || true
 }
 
diff --git a/testing/lxd/APKBUILD b/testing/lxd/APKBUILD
index cf7d8dd2529..c15977598f0 100644
--- a/testing/lxd/APKBUILD
+++ b/testing/lxd/APKBUILD
@@ -58,7 +58,7 @@ makedepends="
 	"
 subpackages="
 	$pkgname-scripts:scripts:noarch
-	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-bash-completion
 	$pkgname-openrc
 	"
 install="$pkgname.pre-install"
@@ -105,6 +105,10 @@ package() {
 		"$pkgdir"/etc/init.d/lxd
 	install -Dm644 "$srcdir"/lxd.confd \
 		"$pkgdir"/etc/conf.d/lxd
+
+	# BASH Completion
+	mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+	cp scripts/bash/lxd-client "$pkgdir"/usr/share/bash-completion/completions/lxd-client
 }
 
 bashcomp() {
diff --git a/testing/nitrocli/APKBUILD b/testing/nitrocli/APKBUILD
index 41e35a38260..90024f35354 100644
--- a/testing/nitrocli/APKBUILD
+++ b/testing/nitrocli/APKBUILD
@@ -9,7 +9,7 @@ arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by rust/cargo
 license="GPL-3.0-or-later"
 depends="gnupg"
 makedepends="cargo hidapi-dev"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion"
 source="https://github.com/d-e-s-o/nitrocli/archive/v$pkgver/nitrocli-$pkgver.tar.gz"
 
 build() {
diff --git a/testing/openscap/APKBUILD b/testing/openscap/APKBUILD
index 7a21cbecbce..6cda7a9baba 100644
--- a/testing/openscap/APKBUILD
+++ b/testing/openscap/APKBUILD
@@ -13,7 +13,7 @@ makedepends="cmake python3-dev dbus-dev dbus-glib-dev bash libselinux-dev
 	rpm-dev swig bzip2-dev asciidoc fts-dev doxygen procps-dev
 	libbz2 util-linux-dev nss-dev"
 options="!check"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion"
 source="https://github.com/OpenSCAP/openscap/releases/download/$pkgver/openscap-$pkgver.tar.gz
 	fix-ppc64le-path_max.patch
 	path_mounted.patch
@@ -40,15 +40,9 @@ build() {
 package() {
 	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
 	install -Dm644 "$builddir"/dist/bash_completion.d/oscap \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
+		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 }
 
 sha512sums="686dbae35fa7b3a3fcb05b0e8babc15249b1830b61388d57b4107507c3a133b9c87a8d32bdd7a796c2726f13774a706b8ed0c9bab158f98eaebec7859fc96755  openscap-1.3.4.tar.gz
diff --git a/testing/phoronix-test-suite/APKBUILD b/testing/phoronix-test-suite/APKBUILD
index ab01c31dcdd..340f634d18a 100644
--- a/testing/phoronix-test-suite/APKBUILD
+++ b/testing/phoronix-test-suite/APKBUILD
@@ -8,7 +8,7 @@ url="https://www.phoronix-test-suite.com/"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="php8 php8-dom php8-zip php8-json php8-simplexml php8-pcntl php8-curl"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-doc $pkgname-bash-completion"
 provides="phoromatic-server phoromatic-client"
 source="$pkgname-$pkgver.tar.gz::https://github.com/phoronix-test-suite/phoronix-test-suite/archive/v$pkgver.tar.gz"
 options="!check" # no tests
@@ -21,12 +21,4 @@ package() {
 	mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
 }
 
-bashcomp() {
-	depends=""
-	pkgdesk="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	amove usr/share/bash-completion/completions
-}
-
 sha512sums="52a91d6212e6283b3f6252e825df4cc7f2d66a807695bda58589cfd5d92726eecb25134f12a9f5260cd5f171804362fba41573a1bb4e38237a7e671b4f9242fb  phoronix-test-suite-10.2.2.tar.gz"
diff --git a/testing/vcstool/APKBUILD b/testing/vcstool/APKBUILD
index 053a043e80d..7a6cc235e81 100644
--- a/testing/vcstool/APKBUILD
+++ b/testing/vcstool/APKBUILD
@@ -10,9 +10,10 @@ license="Apache-2.0"
 depends="python3 py3-yaml"
 makedepends="py3-setuptools"
 checkdepends="py3-pytest py3-flake8 py3-pydocstyle py3-flake8-import-order subversion mercurial git"
-subpackages="$pkgname-bash-completion:bashcomp:noarch
-	$pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-tcsh-completion:tcshcomp:noarch"
+subpackages="$pkgname-bash-completion
+	$pkgname-zsh-completion
+	$pkgname-tcsh-completion:tcshcomp:noarch
+	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/dirk-thomas/vcstool/archive/$pkgver.tar.gz
 	pr146.patch::https://github.com/dirk-thomas/vcstool/commit/bd71528e0f9244e9ca1f409b859f10dea2ad3cda.patch"  # can be removed in next version when merged