aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptrcnull <git@ptrcnull.me>2022-06-20 19:57:00 +0200
committeralice <alice@ayaya.dev>2022-06-20 18:54:40 +0000
commite185ac2775485c65e5ea165a3653c65cdc4303b7 (patch)
tree6a4e74ee46e743b001da2dde32ab64c49f5979ed
parentc8fdfac93505f28fb34652175b85db5b181e94d3 (diff)
downloadaports-e185ac2775485c65e5ea165a3653c65cdc4303b7.tar.gz
aports-e185ac2775485c65e5ea165a3653c65cdc4303b7.tar.bz2
aports-e185ac2775485c65e5ea165a3653c65cdc4303b7.tar.xz
main/apk-tools: fix truncating names in zsh completion
simplifies overly complicated pkgver-pkgrel handling in favour of one simple substitution: trimming '-*-r[[:digit:]]*'
-rw-r--r--main/apk-tools/APKBUILD4
-rw-r--r--main/apk-tools/_apk4
2 files changed, 4 insertions, 4 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index b472c58fa9..59f5710424 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.12.9
-pkgrel=4
+pkgrel=5
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -87,5 +87,5 @@ luaapk() {
sha512sums="
2e299e50c5ca8733f04fad971247146ff4bebb697c3589e4692c9a940ede89432dd9fea48004dc947cb493db1206a336ac0ad1e876b02683183d69b4a127d1c6 apk-tools-v2.12.9.tar.gz
-ba5a35b118ac17ea90e2b4d981e10c29c2c1bb11d5dbec573005b4709dc21e99c808839fa40c8e55cfdb32a0a305e091a46a109e50197fadb4a8ce71b48b0000 _apk
+7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e _apk
"
diff --git a/main/apk-tools/_apk b/main/apk-tools/_apk
index 60ed159418..4b4a238fc6 100644
--- a/main/apk-tools/_apk
+++ b/main/apk-tools/_apk
@@ -62,7 +62,7 @@ function _apk {
zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail
local IFS=$'\n'
if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then
- _apk_available_packs=(${${$(/sbin/apk list -a 2>/dev/null)%% *}%%-[[:digit:].]##([[:alpha:]]#)#(*[[:alpha:]]#[[:digit:]])#(-r[[:digit:]]##)#})
+ _apk_available_packs=(${${$(/sbin/apk list -a 2>/dev/null)%% *}%-*-r[[:digit:]]*})
_store_cache apk_index_packages_available _apk_available_packs
fi
_describe 'available packages' _apk_available_packs
@@ -73,7 +73,7 @@ function _apk {
zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world
local IFS=$'\n'
if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then
- _apk_installed_packs=(${${$(/sbin/apk list -I 2>/dev/null)%% *}%%-[[:digit:].]##([[:alpha:]]#)#(*[[:alpha:]]#[[:digit:]])#(-r[[:digit:]]##)#})
+ _apk_installed_packs=(${${$(/sbin/apk list -I 2>/dev/null)%% *}%-*-r[[:digit:]]*})
_store_cache apk_index_packages_installed _apk_installed_packs
fi
_describe 'installed packages' _apk_installed_packs