mrrl-containers

commit 8b3b6df52d6609edcba81317f5d66619737543c1
parent ee86b32992a648369e29099272ae594e542b77c1
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Wed, 26 Jul 2023 17:21:59 +0200

poppler-utils for mail, use posix test where applicable
Diffstat:
M
service_scripts/alsa/run
 | 
2
+-
M
service_scripts/generic/run
 | 
2
+-
M
zsh-functions/confz_site_containers_init
 | 
2
++

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/service_scripts/alsa/run b/service_scripts/alsa/run
@@ -35,7 +35,7 @@ s6-envuidgid ${CONTAINER_USER}
 
 # Run user's setup script (optional)
 if {
-	ifelse { eltest -x ${CONTAINER_USER_HOME}/container-setup } {
+	ifelse { test -x ${CONTAINER_USER_HOME}/container-setup } {
 		env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
 		s6-applyuidgid -U
 		${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -35,7 +35,7 @@ s6-envuidgid ${CONTAINER_USER}
 
 # Run user's setup script (optional)
 if {
-	ifelse { eltest -x ${CONTAINER_USER_HOME}/container-setup } {
+	ifelse { test -x ${CONTAINER_USER_HOME}/container-setup } {
 		env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
 		s6-applyuidgid -U
 		${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -346,6 +346,7 @@ confz_site_container_images_check() {
 		py3-{notmuch,urwid{,trees},twisted,magic,gpgme}  # alot
 		git
 		msmtp
+		poppler-utils  # pdftotext
 	)
 	require site_container_alpine :containers_dir :svscan_dir \
 		repositories="main community testing" \
@@ -419,6 +420,7 @@ confz_site_container_images_check() {
 		openssl
 	)
 	require site_container_alpine :containers_dir :svscan_dir \
+		repositories="main community testing" \
 		image_name=alpine-socials packages="$alpine_socials"
 
 	local -a alpine_office=(