From 1b5ef403c704122f341865c58832ad25a9a981ed Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sat, 4 May 2024 22:20:41 +0200
Subject: [PATCH] wip/pkg

---
 cd.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/cd.sh b/cd.sh
index 63aad9a..500b144 100644
--- a/cd.sh
+++ b/cd.sh
@@ -114,6 +114,7 @@ cd_set_environment_variables () {
             CD_CMD_INSTALL="dnf install --assumeyes"
             CD_CMD_UPDATE="dnf makecache"
             CD_CMD_UPGRADE="dnf upgrade --assumeyes"
+            CD_PKG_PKG=""
             CD_PM_CONF_PATH="/etc/dnf/dnf.conf"
             CD_PM_CONF_TEXT="\
 [main]
@@ -131,6 +132,7 @@ skip_if_unavailable=False
             CD_CMD_INSTALL="apk add"
             CD_CMD_UPDATE="apk update"
             CD_CMD_UPGRADE="apk upgrade"
+            CD_PKG_PKG=""
             CD_PM_CONF_PATH=""
             CD_PM_CONF_TEXT=""
             CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https"
@@ -141,6 +143,7 @@ skip_if_unavailable=False
             CD_CMD_INSTALL="apt-get install --assume-yes"
             CD_CMD_UPDATE="apt-get update"
             CD_CMD_UPGRADE="apt-get upgrade --assume-yes"
+            CD_PKG_PKG="apt-utils"
             CD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf"
             CD_PM_CONF_TEXT="\
 Acquire::Check-Valid-Until True;
@@ -156,7 +159,7 @@ Dir::Etc::SourceParts \"\";
     cd_split
     cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE"
     cd_split
-    cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH"
+    cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH"
     # specific
     case "${CD_OS_ID}" in
         "${CD_OS_ALMA}")
@@ -231,20 +234,10 @@ Dir::Etc::SourceParts \"\";
     cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES"
     # TODO
     case "${CD_OS_ID}" in
-        "${CD_OS_ALMA}")
-            CD_PKG_PKG=""
-        ;;
-        "${CD_OS_ALPINE}")
-            CD_PKG_PKG=""
-        ;;
         "${CD_OS_DEBIAN}")
             export DEBIAN_FRONTEND="noninteractive"
-            #
-            CD_PKG_PKG="apt-utils"
         ;;
     esac
-    cd_split
-    cd_echo "CD_PKG_PKG"
     # variables
     [ "${CD_CA_1}" ] && CD_CA=true
     # continuous integration platform