From 9a6a5eeaf818843bbfffa6b3d880438fbec0bae0 Mon Sep 17 00:00:00 2001
From: Levon Gevorgyan <lgevorgyan03@gmail.com>
Date: Wed, 6 Aug 2025 07:56:49 -0500
Subject: [PATCH] fontconfig-devel

---
 Jenkinsfile         | 2 +-
 lib/docker.sh       | 5 +++--
 lib/install_deps.sh | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9fdac14..c73e51d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
                     axis {
                         name 'DISTRO'
                         values 'ubuntu-22.04', 'ubuntu-24.04', 
-                            'debian-bookworm', 'fedora-42'
+                            'debian-12', 'fedora-42'
                             // 'archlinux-latest'
                     }
                     axis {
diff --git a/lib/docker.sh b/lib/docker.sh
index 685beb4..caa4f2e 100644
--- a/lib/docker.sh
+++ b/lib/docker.sh
@@ -3,8 +3,8 @@
 VALID_DOCKER_IMAGES=(
 	'ubuntu-22.04' 'ubuntu-24.04'
 	'fedora-41' 'fedora-42'
+	'debian-12'
 	'archlinux-latest'
-	'debian-bookworm'
 )
 
 check_docker() {
@@ -72,7 +72,7 @@ docker_build_image() {
 			echo 'RUN ln -sf /bin/bash /bin/sh'
 			echo 'ENV DEBIAN_FRONTEND=noninteractive'
 			echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}"
-			echo "RUN ${pkg_install} ${req_pkgs}"
+			printf "RUN ${pkg_install} %s\n" "${req_pkgs[@]}"
 			echo 'RUN pipx install virtualenv'
 			echo 'RUN pipx ensurepath'
 			echo 'RUN curl https://sh.rustup.rs -sSf | bash -s -- -y'
@@ -82,6 +82,7 @@ docker_build_image() {
 
 		} >"${dockerfile}"
 
+		exit 0
 		echo_info "building ${image_tag}"
 		docker build \
 			-t "${image_tag}" \
diff --git a/lib/install_deps.sh b/lib/install_deps.sh
index a5ab258..81c45bb 100644
--- a/lib/install_deps.sh
+++ b/lib/install_deps.sh
@@ -12,7 +12,7 @@ determine_pkg_mgr() {
 brew:brew update:brew upgrade:brew install:brew list --formula ${pkg}
 apt-get:${SUDO}apt-get update:${SUDO}apt-get upgrade -y:${SUDO}apt-get install -y:dpkg -l ${pkg}
 pacman:${SUDO}pacman -Syy:${SUDO}pacman -Syu --noconfirm:${SUDO}pacman -S --noconfirm --needed:pacman -Qi ${pkg}
-dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg}
+dnf:{ ${SUDO}dnf check-update || true }:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg}
 '
 	local supported_pkg_mgr=()
 	unset pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check
@@ -73,7 +73,7 @@ print_req_pkgs() {
 	# shellcheck disable=SC2034
 	local dnf_pkgs=(
 		"${common_linux_pkgs[@]}" openssl-devel
-		pipx ninja-build wget2
+		pipx ninja-build fontconfig-devel wget2
 	)
 
 	local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs"
@@ -93,7 +93,7 @@ print_pkg_mgr() {
 	echo "export pkg_mgr_upgrade=\"${pkg_mgr_upgrade}\""
 	echo "export pkg_install=\"${pkg_install}\""
 	echo "export pkg_check=\"${pkg_check}\""
-	echo "export req_pkgs=\"$(print_req_pkgs)\""
+	echo "export req_pkgs=($(print_req_pkgs))"
 }
 
 print_os() {