commit 7e091b390cc6c81c299b251e909774c9aefd094d parent 07aa70d82c908af462d15ce7940199ff92b51a5c Author: ccx <ccx@te2000.cz> Date: Thu, 4 Apr 2024 16:28:43 +0000 Make dedicated function for container_sysroot_run Diffstat:
| M | zsh-functions/confz_containers_init | | | 10 | ++++++++-- |
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init @@ -919,6 +919,13 @@ confz_container_alpine_image_check() { require container_alpine_apk :arch :root :sysroot_user } +container_run() { + local svcdir=$1 + shift + $commands[cd] $vars[sysroot_svc] container_sysroot_run "$@" +} +typeset -f -t container_run + confz_container_alpine_packages_installed_check() { checkvars containers_dir image_name packages svscan_dir @@ -929,8 +936,7 @@ confz_container_alpine_packages_installed_check() { local root=$vars[containers_dir]/systems/$vars[image_name] local -a world=( "${(@f)$(<$root/etc/apk/world)}" ) local -a installed=( "${(@f)$( - $commands[cd] $vars[sysroot_svc] container_sysroot_run - /sbin/apk info -a + container_run $vars[sysroot_svc] /sbin/apk info -a </dev/null )}" ) local -a missing local pkg