aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Karasev <begs@disroot.org>2022-04-10 23:39:11 +0300
committeralice <alice@ayaya.dev>2022-05-15 05:20:00 +0000
commit34d90ac8388e88126893f5d27ea35d304e65e5ab (patch)
tree159a2dd17dd50df80d39e6d6b9c7656ce4c8548b
parentf7cae53e65a120909f89508811cb8f0d697bd395 (diff)
downloadaports-34d90ac8388e88126893f5d27ea35d304e65e5ab.tar.gz
aports-34d90ac8388e88126893f5d27ea35d304e65e5ab.tar.bz2
aports-34d90ac8388e88126893f5d27ea35d304e65e5ab.tar.xz
main/apk-tools: fix zsh completion pkgver handling
Currently completion fails to strip *_git* from package name when searching for available/installed packages. This fixes such behavior. I tried to understand how that expression works, but failed. The "fix" is found by randomly trying some changes.
-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 11c761fd84..32c4b716e0 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=2
+pkgrel=3
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
-48d5437bb8e76b56f972430ac95f1f408687dd2734ff3e69192140abe8f301154329d9cbef0c17da86ac8d825f32bc818376bdfb672bf44adbfa5e21c957d5ec _apk
+ba5a35b118ac17ea90e2b4d981e10c29c2c1bb11d5dbec573005b4709dc21e99c808839fa40c8e55cfdb32a0a305e091a46a109e50197fadb4a8ce71b48b0000 _apk
"
diff --git a/main/apk-tools/_apk b/main/apk-tools/_apk
index 0ce54d74de..60ed159418 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)%% *}%%-[[:digit:].]##([[:alpha:]]#)#(*[[:alpha:]]#[[:digit:]])#(-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)%% *}%%-[[:digit:].]##([[:alpha:]]#)#(*[[:alpha:]]#[[:digit:]])#(-r[[:digit:]]##)#})
_store_cache apk_index_packages_installed _apk_installed_packs
fi
_describe 'installed packages' _apk_installed_packs