aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSertonix <sertonix@posteo.net>2024-04-08 15:07:45 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2024-04-10 07:21:08 +0000
commit3353d625e0b0b08424b479f8ce6ff35123578385 (patch)
tree5c1ec120d673b567be8bd92bf4034b076c928766
parentdc88e16b302705fa12d712ced1e92a62a4374e97 (diff)
main/*: simplify shell completions
-rw-r--r--main/dpkg/APKBUILD4
-rw-r--r--main/etckeeper/APKBUILD30
-rw-r--r--main/grub/APKBUILD12
-rw-r--r--main/lxc/APKBUILD4
-rw-r--r--main/mosh/APKBUILD13
-rw-r--r--main/rust/APKBUILD12
6 files changed, 20 insertions, 55 deletions
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index 229c9df386b..c3900fe9996 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dpkg
pkgver=1.22.6
-pkgrel=0
+pkgrel=1
pkgdesc="The Debian Package Manager"
url="https://wiki.debian.org/Teams/Dpkg"
arch="all"
@@ -9,7 +9,7 @@ license="GPL-2.0-or-later AND BSD-2-Clause"
depends="tar xz"
checkdepends="gzip"
makedepends="bzip2-dev linux-headers perl zlib-dev po4a libmd-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-zsh-completion:zshcomp:noarch"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-zsh-completion"
source="https://deb.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.xz"
# secfixes:
diff --git a/main/etckeeper/APKBUILD b/main/etckeeper/APKBUILD
index d9a9dc9065b..48470dd7ce9 100644
--- a/main/etckeeper/APKBUILD
+++ b/main/etckeeper/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
pkgname=etckeeper
pkgver=1.18.21
-pkgrel=0
+pkgrel=1
pkgdesc="Store /etc in git."
url="https://etckeeper.branchable.com/"
arch="noarch"
@@ -11,8 +11,8 @@ checkdepends="bats fakeroot"
depends="findutils git"
subpackages="
$pkgname-doc
- $pkgname-bash-completion:bashcomp:noarch
- $pkgname-zsh-completion:zshcomp:noarch
+ $pkgname-bash-completion
+ $pkgname-zsh-completion
"
install="$pkgname.post-install $pkgname.pre-deinstall"
source="$pkgname-$pkgver.tar.gz::https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-$pkgver.tar.gz
@@ -31,27 +31,6 @@ check() {
make test
}
-bashcomp() {
- depends=""
- pkgdesc="Bash completions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- install -dm755 "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/bash-completion \
- "$subpkgdir"/usr/share/
-}
-
-zshcomp() {
- depends=""
- pkgdesc="Zsh completions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
- install -dm755 "$subpkgdir"/usr/share/zsh
- mv "$pkgdir"/usr/share/zsh/vendor-completions \
- "$subpkgdir"/usr/share/zsh/site-functions
- rmdir "$pkgdir"/usr/share/zsh
-}
-
package() {
make install DESTDIR="$pkgdir"
rm -rf "$pkgdir"/lib/systemd
@@ -63,6 +42,9 @@ package() {
install -m755 -D "$srcdir"/apk-commit_hook \
"$pkgdir"/etc/apk/commit_hooks.d/"$pkgname"
+
+ mv "$pkgdir"/usr/share/zsh/vendor-completions \
+ "$pkgdir"/usr/share/zsh/site-functions
}
sha512sums="
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index 2bb10beb271..9820b1a0f35 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.12
-pkgrel=2
+pkgrel=3
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -19,7 +19,7 @@ subpackages="
$pkgname-doc
$pkgname-mkfont
$pkgname-mount
- $pkgname-bash-completion:bashcomp:noarch
+ $pkgname-bash-completion
"
# currently grub only builds on x86*, aarch64 and ppc* systems
@@ -258,14 +258,6 @@ mount() {
mv $pkgdir/usr/bin/grub-mount $subpkgdir/usr/bin/
}
-bashcomp() {
- depends=""
- pkgdesc="Bash completions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
- amove usr/share/bash-completion/completions
-}
-
sha512sums="
761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3 grub-2.12.tar.xz
85b3c56670fb0aaaf831cc6d7ca45faeb68b844cb17cfd6f9b51c2473f0b153cfa7b26ff8bf00a88b2ed3e0ae69a1e8f735256e6cecc91e959169606e2abf887 update-grub
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index 3cdfbb6d280..378798961aa 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -4,7 +4,7 @@
pkgname=lxc
pkgver=6.0.0
_pkgver=${pkgver/_rc/.rc}
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace interface for the Linux kernel containment features"
url="https://linuxcontainers.org/lxc/"
arch="all"
@@ -29,7 +29,7 @@ subpackages="
$pkgname-test-utils:_test_utils
$pkgname-libs
$pkgname-bridge::noarch
- $pkgname-bash-completion:bashcomp:noarch
+ $pkgname-bash-completion
$pkgname-pam
$pkgname-download:_download:noarch
$pkgname-templates-oci:templates_oci:noarch
diff --git a/main/mosh/APKBUILD b/main/mosh/APKBUILD
index 398fd67b616..eb1a869a01e 100644
--- a/main/mosh/APKBUILD
+++ b/main/mosh/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=mosh
pkgver=1.4.0
-pkgrel=7
+pkgrel=8
pkgdesc="Mobile shell surviving disconnects with local echo and line editing"
url="https://mosh.org"
arch="all"
@@ -28,7 +28,7 @@ subpackages="
$pkgname-server
$pkgname-server-doc:serverdoc:noarch
$pkgname-doc
- $pkgname-bash-completion:bashcomp:noarch"
+ $pkgname-bash-completion"
source="https://github.com/mobile-shell/mosh/archive/refs/tags/mosh-$pkgver.tar.gz
fix-ppc64le-build-with-musl.patch
fix-makefile.am.patch
@@ -64,15 +64,8 @@ check() {
package() {
make DESTDIR="$pkgdir" install
-}
-
-bashcomp() {
- depends=""
- pkgdesc="Bash completions for $pkgname"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
install -Dm644 "$builddir"/conf/bash-completion/completions/mosh \
- "$subpkgdir"/usr/share/bash-completion/completions/$pkgname
+ "$pkgdir"/usr/share/bash-completion/completions/$pkgname
}
server() {
diff --git a/main/rust/APKBUILD b/main/rust/APKBUILD
index 1fd56831874..2b4c586e0c4 100644
--- a/main/rust/APKBUILD
+++ b/main/rust/APKBUILD
@@ -10,7 +10,7 @@ pkgname=rust
pkgver=1.77.0
_llvmver=17
_bootver=1.76.0
-pkgrel=0
+pkgrel=1
pkgdesc="Rust Programming Language toolchain"
url="https://www.rust-lang.org/"
arch="all"
@@ -425,21 +425,19 @@ rustfmt() {
}
_cargo_bashcomp() {
+ default_bashcomp
+
pkgdesc="Bash completions for cargo"
license="Apache-2.0 MIT"
- depends=""
install_if="cargo=$pkgver-r$pkgrel bash-completion"
-
- amove usr/share/bash-completion
}
_cargo_zshcomp() {
+ default_zshcomp
+
pkgdesc="ZSH completions for cargo"
license="Apache-2.0 MIT"
- depends=""
install_if="cargo=$pkgver-r$pkgrel zsh"
-
- amove usr/share/zsh/site-functions/_cargo
}
_cargo_doc() {