cd.sh

@@ -134,28 +134,13 @@ cd_set_environment_variables () {
     cd_echo "CD_CA_ROOT" "CD_CMD_CA"
     # set package manager
     case "${CD_OS_ID}" in
-        "${CD_OS_ALPINE}")
-            CD_PM="${CD_PM_APK}"
-        ;;
-        "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}")
-            CD_PM="${CD_PM_APT}"
-        ;;
         "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}")
             CD_PM="${CD_PM_DNF}"
-        ;;
-        "${CD_OS_ARCH}")
-            CD_PM="${CD_PM_PACMAN}"
-        ;;
-    esac
-    cd_split
-    cd_echo "CD_PM"
-    case "${CD_PM}" in
-        "${CD_PM_DNF}")
-            CD_PM_CLEAN="dnf clean all"
-            CD_PM_INSTALL="dnf install --assumeyes"
-            CD_PM_QUERY="rpm --query"
-            CD_PM_UPDATE="dnf makecache"
-            CD_PM_UPGRADE="dnf upgrade --assumeyes"
+            CD_CMD_CLEAN="dnf clean all"
+            CD_CMD_INSTALL="dnf install --assumeyes"
+            CD_CMD_QUERY="rpm --query"
+            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="\
@@ -169,36 +154,39 @@ skip_if_unavailable=False
             CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf"
             CD_PM_HTTPS_TEXT="sslverify=False"
         ;;
-        "${CD_PM_APK}")
-            CD_PM_CLEAN="apk cache purge"
-            CD_PM_INSTALL="apk add"
-            CD_PM_QUERY="apk info"
-            CD_PM_UPDATE="apk update"
-            CD_PM_UPGRADE="apk upgrade"
+        "${CD_OS_ALPINE}")
+            CD_PM="${CD_PM_APK}"
+            CD_CMD_CLEAN="apk cache purge"
+            CD_CMD_INSTALL="apk add"
+            CD_CMD_QUERY="apk info"
+            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"
             CD_PM_HTTPS_TEXT="--no-verify"
         ;;
-        "${CD_PM_PACMAN}")
-            CD_PM_CLEAN="pacman --sync --clean --noconfirm"
-            CD_PM_INSTALL="pacman --sync --noconfirm"
-            CD_PM_QUERY="pacman --query"
-            CD_PM_UPDATE="pacman --sync --refresh"
-            CD_PM_UPGRADE="pacman --sync --sysupgrade --noconfirm"
+        "${CD_OS_ARCH}")
+            CD_PM="${CD_PM_PACMAN}"
+            CD_CMD_CLEAN="pacman --sync --clean --noconfirm"
+            CD_CMD_INSTALL="pacman --sync --noconfirm"
+            CD_CMD_QUERY="pacman --query"
+            CD_CMD_UPDATE="pacman --sync --refresh"
+            CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm"
             CD_PKG_PKG=""
             CD_PM_CONF_PATH=""
             CD_PM_CONF_TEXT=""
             CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf"
             CD_PM_HTTPS_TEXT="SSLVerify = No"
         ;;
-        "${CD_PM_APT}")
-            CD_PM_CLEAN="apt-get clean"
-            CD_PM_INSTALL="apt-get install --assume-yes"
-            CD_PM_QUERY="dpkg-query --show"
-            CD_PM_UPDATE="apt-get update"
-            CD_PM_UPGRADE="apt-get upgrade --assume-yes"
+        "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}")
+            CD_PM="${CD_PM_APT}"
+            CD_CMD_CLEAN="apt-get clean"
+            CD_CMD_INSTALL="apt-get install --assume-yes"
+            CD_CMD_QUERY="dpkg-query --show"
+            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="\
@@ -213,8 +201,8 @@ Dir::Etc::SourceParts \"\";
         ;;
     esac
     cd_split
-    cd_echo "CD_PM_CLEAN" \
-        "CD_PM_INSTALL" "CD_PM_QUERY" "CD_PM_UPDATE" "CD_PM_UPGRADE"
+    cd_echo "CD_CMD_CLEAN" \
+        "CD_CMD_INSTALL" "CD_CMD_QUERY" "CD_CMD_UPDATE" "CD_CMD_UPGRADE"
     cd_split
     cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH"
     # specific
@@ -444,7 +432,7 @@ local text=""
 
 cd_update_packages_catalog () {
     cd_step "Update packages catalog"
-    ${CD_PM_UPDATE} || exit
+    ${CD_CMD_UPDATE} || exit
 }
 
 cd_install_packages_tools () {
@@ -487,7 +475,7 @@ cd_set_https_verification_on () {
 
 cd_upgrade_packages () {
     cd_step "Upgrade packages"
-    ${CD_PM_UPGRADE} || exit
+    ${CD_CMD_UPGRADE} || exit
 }
 
 cd_install_git () {
@@ -504,7 +492,7 @@ cd_install_python () {
 
 cd_clean_packages_cache () {
     cd_step "Clean packages cache"
-    ${CD_PM_CLEAN} || exit
+    ${CD_CMD_CLEAN} || exit
 }
 
 cd_install_python_modules () {
@@ -592,7 +580,7 @@ local variable="${1}"
 
 cd_install_package () {
     if [ "${1}" ] ; then
-        ${CD_PM_INSTALL} "${1}" || exit
+        ${CD_CMD_INSTALL} "${1}" || exit
     fi
 }