mrrl-containers

commit 565561dbd234363a0d55f6086b1304251eaa2692
parent f6e0aa17ab9f74a2960e79ee2aa138e93e948975
Author: ccx <ccx@te2000.cz>
Date:   Fri,  5 Apr 2024 17:25:26 +0000

Update package names, allow net for bzr temporarily

Diffstat:
M
zsh-functions/confz_containers_init
 | 
2
+-
M
zsh-functions/confz_site_containers_init
 | 
26
+++++++++++++-------------

2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -924,7 +924,6 @@ container_run() {
 	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
@@ -950,6 +949,7 @@ confz_container_alpine_packages_installed_check() {
 		/sbin/apk add --no-chown $missing
 	)
 
+	fail_reason="Following packages are not installed: $missing (req:${#$=vars[packages]} ins:$#installed)"
 	(( $#missing == 0 ))
 }
 
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -120,7 +120,7 @@ confz_site_containers_user_check() {
 		twitch void-browsers
 		neonmodem alpine-go
 		simplex alpine-haskell
-		bzr $'alpine-breezy\0mount_rw=ccx-bzr\0pid1_exec='${(F)netns}
+		bzr $'alpine-breezy\0mount_rw=ccx-bzr' #\0pid1_exec='${(F)netns}
 		spark $'alpine-dev-spark\0mount_rw=ccx-bzr ccx-git'
 		sndiod $'alpine-sndio\0container_type=alsa'
 		mpd $'void-mpd\0mount_ro=init audio'
@@ -271,9 +271,9 @@ confz_site_container_images_check() {
 		$alpine_community
 		fontconfig
 		rxvt-unicode
-		sxiv
-		terminus-font
-		unifont
+		nsxiv
+		font-terminus
+		font-unifont
 		#wmctrl
 		xauth
 		xbindkeys
@@ -316,7 +316,7 @@ confz_site_container_images_check() {
 		packages="$alpine_dev_core go"
 
 	require site_container_alpine :containers_dir :svscan_dir \
-		image_name=alpine-gpg packages="$alpine_terminal gnupg gnupg-scdaemon pinentry-tty pinentry-curses"
+		image_name=alpine-gpg packages="$alpine_terminal gnupg gnupg-scdaemon pinentry-tty pinentry-curses-ss"
 
 	require site_container_alpine :containers_dir :svscan_dir \
 		image_name=alpine-ssh packages="$alpine_terminal openssh dropbear make"
@@ -353,7 +353,7 @@ confz_site_container_images_check() {
 		$alpine_terminal
 		bash
 		coreutils  # (for dd)
-		procps  # (for ps)
+		procps-ng  # (for ps)
 		git
 		make
 		patch
@@ -409,7 +409,7 @@ confz_site_container_images_check() {
 		#lxappearance
 		mupdf
 		mupdf-x11
-		p7zip
+		7zip
 		qutebrowser
 		rsync
 		vimb
@@ -428,7 +428,7 @@ confz_site_container_images_check() {
 		firefox
 		font-noto
 		#lxappearance
-		p7zip
+		7zip
 		rsync
 		coreutils  # cat -s in ff-mkprofile
 		py3-pynvim neovim # neovim + bindings for https://github.com/fregante/GhostText
@@ -466,7 +466,7 @@ confz_site_container_images_check() {
 		#lxappearance
 		mupdf
 		mupdf-x11
-		p7zip
+		7zip
 		catdoc
 		abiword
 		gnumeric
@@ -562,7 +562,7 @@ confz_site_container_images_check() {
 		image_name=void-mpd packages="$void_core sndio sox mpd mpc ncmpcpp"
 
 	require site_container_void_musl :containers_dir :svscan_dir \
-		image_name=void-telegram packages="$void_x11 sndio sox telegram-desktop sxiv"
+		image_name=void-telegram packages="$void_x11 sndio sox telegram-desktop nsxiv"
 
 	require site_container_void_musl :containers_dir :svscan_dir \
 		image_name=void-browsers packages="$void_x11 sndio sox firefox"
@@ -631,10 +631,10 @@ confz_site_container_images_check() {
 		rxvt-unicode-doc
 		scrot
 		setxkbmap
-		sxiv
-		terminus-font
+		nsxiv
+		font-terminus
 		tmux
-		unifont
+		font-unifont
 		vis
 		# wmctrl
 		xautolock