From 794165c012bbf6d012afef626104247cfdba4fd0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 16:40:03 +0200 Subject: [PATCH 1/6] cd_pm --- cd.sh | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index ee3241f..7dd8860 100644 --- a/cd.sh +++ b/cd.sh @@ -134,8 +134,23 @@ 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_CMD_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_QUERY="rpm --query" @@ -154,8 +169,7 @@ skip_if_unavailable=False CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" CD_PM_HTTPS_TEXT="sslverify=False" ;; - "${CD_OS_ALPINE}") - CD_PM="${CD_PM_APK}" + "${CD_PM_APK}") CD_CMD_CLEAN="apk cache purge" CD_CMD_INSTALL="apk add" CD_CMD_QUERY="apk info" @@ -167,8 +181,7 @@ skip_if_unavailable=False CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" CD_PM_HTTPS_TEXT="--no-verify" ;; - "${CD_OS_ARCH}") - CD_PM="${CD_PM_PACMAN}" + "${CD_PM_PACMAN}") CD_CMD_CLEAN="pacman --sync --clean --noconfirm" CD_CMD_INSTALL="pacman --sync --noconfirm" CD_CMD_QUERY="pacman --query" @@ -180,8 +193,7 @@ skip_if_unavailable=False CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" CD_PM_HTTPS_TEXT="SSLVerify = No" ;; - "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") - CD_PM="${CD_PM_APT}" + "${CD_PM_APT}") CD_CMD_CLEAN="apt-get clean" CD_CMD_INSTALL="apt-get install --assume-yes" CD_CMD_QUERY="dpkg-query --show" From 27f632eb673709b9abb6d77325f5e10318c64a84 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 20:18:22 +0200 Subject: [PATCH 2/6] pm/clean --- cd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index 7dd8860..fb6f473 100644 --- a/cd.sh +++ b/cd.sh @@ -151,7 +151,7 @@ cd_set_environment_variables () { cd_echo "CD_PM" case "${CD_PM}" in "${CD_PM_DNF}") - CD_CMD_CLEAN="dnf clean all" + CD_PM_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_QUERY="rpm --query" CD_CMD_UPDATE="dnf makecache" @@ -170,7 +170,7 @@ skip_if_unavailable=False CD_PM_HTTPS_TEXT="sslverify=False" ;; "${CD_PM_APK}") - CD_CMD_CLEAN="apk cache purge" + CD_PM_CLEAN="apk cache purge" CD_CMD_INSTALL="apk add" CD_CMD_QUERY="apk info" CD_CMD_UPDATE="apk update" @@ -182,7 +182,7 @@ skip_if_unavailable=False CD_PM_HTTPS_TEXT="--no-verify" ;; "${CD_PM_PACMAN}") - CD_CMD_CLEAN="pacman --sync --clean --noconfirm" + CD_PM_CLEAN="pacman --sync --clean --noconfirm" CD_CMD_INSTALL="pacman --sync --noconfirm" CD_CMD_QUERY="pacman --query" CD_CMD_UPDATE="pacman --sync --refresh" @@ -194,7 +194,7 @@ skip_if_unavailable=False CD_PM_HTTPS_TEXT="SSLVerify = No" ;; "${CD_PM_APT}") - CD_CMD_CLEAN="apt-get clean" + CD_PM_CLEAN="apt-get clean" CD_CMD_INSTALL="apt-get install --assume-yes" CD_CMD_QUERY="dpkg-query --show" CD_CMD_UPDATE="apt-get update" @@ -213,7 +213,7 @@ Dir::Etc::SourceParts \"\"; ;; esac cd_split - cd_echo "CD_CMD_CLEAN" \ + cd_echo "CD_PM_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" @@ -504,7 +504,7 @@ cd_install_python () { cd_clean_packages_cache () { cd_step "Clean packages cache" - ${CD_CMD_CLEAN} || exit + ${CD_PM_CLEAN} || exit } cd_install_python_modules () { From e13ffce6918eaa70d5be97d6d7497119454cd2c1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 20:19:11 +0200 Subject: [PATCH 3/6] pm/install --- cd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index fb6f473..13b0766 100644 --- a/cd.sh +++ b/cd.sh @@ -152,7 +152,7 @@ cd_set_environment_variables () { case "${CD_PM}" in "${CD_PM_DNF}") CD_PM_CLEAN="dnf clean all" - CD_CMD_INSTALL="dnf install --assumeyes" + CD_PM_INSTALL="dnf install --assumeyes" CD_CMD_QUERY="rpm --query" CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" @@ -171,7 +171,7 @@ skip_if_unavailable=False ;; "${CD_PM_APK}") CD_PM_CLEAN="apk cache purge" - CD_CMD_INSTALL="apk add" + CD_PM_INSTALL="apk add" CD_CMD_QUERY="apk info" CD_CMD_UPDATE="apk update" CD_CMD_UPGRADE="apk upgrade" @@ -183,7 +183,7 @@ skip_if_unavailable=False ;; "${CD_PM_PACMAN}") CD_PM_CLEAN="pacman --sync --clean --noconfirm" - CD_CMD_INSTALL="pacman --sync --noconfirm" + CD_PM_INSTALL="pacman --sync --noconfirm" CD_CMD_QUERY="pacman --query" CD_CMD_UPDATE="pacman --sync --refresh" CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm" @@ -195,7 +195,7 @@ skip_if_unavailable=False ;; "${CD_PM_APT}") CD_PM_CLEAN="apt-get clean" - CD_CMD_INSTALL="apt-get install --assume-yes" + CD_PM_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" @@ -214,7 +214,7 @@ Dir::Etc::SourceParts \"\"; esac cd_split cd_echo "CD_PM_CLEAN" \ - "CD_CMD_INSTALL" "CD_CMD_QUERY" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" + "CD_PM_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 @@ -592,7 +592,7 @@ local variable="${1}" cd_install_package () { if [ "${1}" ] ; then - ${CD_CMD_INSTALL} "${1}" || exit + ${CD_PM_INSTALL} "${1}" || exit fi } From ae2be1102503c7bebc481450fdf52144c88f898f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 20:20:40 +0200 Subject: [PATCH 4/6] pm/query --- cd.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cd.sh b/cd.sh index 13b0766..fa3bb4f 100644 --- a/cd.sh +++ b/cd.sh @@ -153,7 +153,7 @@ cd_set_environment_variables () { "${CD_PM_DNF}") CD_PM_CLEAN="dnf clean all" CD_PM_INSTALL="dnf install --assumeyes" - CD_CMD_QUERY="rpm --query" + CD_PM_QUERY="rpm --query" CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" CD_PKG_PKG="" @@ -172,7 +172,7 @@ skip_if_unavailable=False "${CD_PM_APK}") CD_PM_CLEAN="apk cache purge" CD_PM_INSTALL="apk add" - CD_CMD_QUERY="apk info" + CD_PM_QUERY="apk info" CD_CMD_UPDATE="apk update" CD_CMD_UPGRADE="apk upgrade" CD_PKG_PKG="" @@ -184,7 +184,7 @@ skip_if_unavailable=False "${CD_PM_PACMAN}") CD_PM_CLEAN="pacman --sync --clean --noconfirm" CD_PM_INSTALL="pacman --sync --noconfirm" - CD_CMD_QUERY="pacman --query" + CD_PM_QUERY="pacman --query" CD_CMD_UPDATE="pacman --sync --refresh" CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm" CD_PKG_PKG="" @@ -196,7 +196,7 @@ skip_if_unavailable=False "${CD_PM_APT}") CD_PM_CLEAN="apt-get clean" CD_PM_INSTALL="apt-get install --assume-yes" - CD_CMD_QUERY="dpkg-query --show" + CD_PM_QUERY="dpkg-query --show" CD_CMD_UPDATE="apt-get update" CD_CMD_UPGRADE="apt-get upgrade --assume-yes" CD_PKG_PKG="apt-utils" @@ -214,7 +214,7 @@ Dir::Etc::SourceParts \"\"; esac cd_split cd_echo "CD_PM_CLEAN" \ - "CD_PM_INSTALL" "CD_CMD_QUERY" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" + "CD_PM_INSTALL" "CD_PM_QUERY" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" # specific From 3435269d236327743d1ee58013c14b5753e1bcec Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 20:21:31 +0200 Subject: [PATCH 5/6] pm/update --- cd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index fa3bb4f..4bbfb69 100644 --- a/cd.sh +++ b/cd.sh @@ -154,7 +154,7 @@ cd_set_environment_variables () { CD_PM_CLEAN="dnf clean all" CD_PM_INSTALL="dnf install --assumeyes" CD_PM_QUERY="rpm --query" - CD_CMD_UPDATE="dnf makecache" + CD_PM_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" CD_PKG_PKG="" CD_PM_CONF_PATH="/etc/dnf/dnf.conf" @@ -173,7 +173,7 @@ skip_if_unavailable=False CD_PM_CLEAN="apk cache purge" CD_PM_INSTALL="apk add" CD_PM_QUERY="apk info" - CD_CMD_UPDATE="apk update" + CD_PM_UPDATE="apk update" CD_CMD_UPGRADE="apk upgrade" CD_PKG_PKG="" CD_PM_CONF_PATH="" @@ -185,7 +185,7 @@ skip_if_unavailable=False CD_PM_CLEAN="pacman --sync --clean --noconfirm" CD_PM_INSTALL="pacman --sync --noconfirm" CD_PM_QUERY="pacman --query" - CD_CMD_UPDATE="pacman --sync --refresh" + CD_PM_UPDATE="pacman --sync --refresh" CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm" CD_PKG_PKG="" CD_PM_CONF_PATH="" @@ -197,7 +197,7 @@ skip_if_unavailable=False CD_PM_CLEAN="apt-get clean" CD_PM_INSTALL="apt-get install --assume-yes" CD_PM_QUERY="dpkg-query --show" - CD_CMD_UPDATE="apt-get update" + CD_PM_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" @@ -214,7 +214,7 @@ Dir::Etc::SourceParts \"\"; esac cd_split cd_echo "CD_PM_CLEAN" \ - "CD_PM_INSTALL" "CD_PM_QUERY" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" + "CD_PM_INSTALL" "CD_PM_QUERY" "CD_PM_UPDATE" "CD_CMD_UPGRADE" cd_split cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" # specific @@ -444,7 +444,7 @@ local text="" cd_update_packages_catalog () { cd_step "Update packages catalog" - ${CD_CMD_UPDATE} || exit + ${CD_PM_UPDATE} || exit } cd_install_packages_tools () { From 80582ddf37ea88041785f98c4a0a80aaba8ddaba Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 20:22:21 +0200 Subject: [PATCH 6/6] pm/upgrade --- cd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index 4bbfb69..f4c9886 100644 --- a/cd.sh +++ b/cd.sh @@ -155,7 +155,7 @@ cd_set_environment_variables () { CD_PM_INSTALL="dnf install --assumeyes" CD_PM_QUERY="rpm --query" CD_PM_UPDATE="dnf makecache" - CD_CMD_UPGRADE="dnf upgrade --assumeyes" + CD_PM_UPGRADE="dnf upgrade --assumeyes" CD_PKG_PKG="" CD_PM_CONF_PATH="/etc/dnf/dnf.conf" CD_PM_CONF_TEXT="\ @@ -174,7 +174,7 @@ skip_if_unavailable=False CD_PM_INSTALL="apk add" CD_PM_QUERY="apk info" CD_PM_UPDATE="apk update" - CD_CMD_UPGRADE="apk upgrade" + CD_PM_UPGRADE="apk upgrade" CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" @@ -186,7 +186,7 @@ skip_if_unavailable=False CD_PM_INSTALL="pacman --sync --noconfirm" CD_PM_QUERY="pacman --query" CD_PM_UPDATE="pacman --sync --refresh" - CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm" + CD_PM_UPGRADE="pacman --sync --sysupgrade --noconfirm" CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" @@ -198,7 +198,7 @@ skip_if_unavailable=False CD_PM_INSTALL="apt-get install --assume-yes" CD_PM_QUERY="dpkg-query --show" CD_PM_UPDATE="apt-get update" - CD_CMD_UPGRADE="apt-get upgrade --assume-yes" + CD_PM_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="\ @@ -214,7 +214,7 @@ Dir::Etc::SourceParts \"\"; esac cd_split cd_echo "CD_PM_CLEAN" \ - "CD_PM_INSTALL" "CD_PM_QUERY" "CD_PM_UPDATE" "CD_CMD_UPGRADE" + "CD_PM_INSTALL" "CD_PM_QUERY" "CD_PM_UPDATE" "CD_PM_UPGRADE" cd_split cd_echo "CD_PKG_PKG" "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" # specific @@ -487,7 +487,7 @@ cd_set_https_verification_on () { cd_upgrade_packages () { cd_step "Upgrade packages" - ${CD_CMD_UPGRADE} || exit + ${CD_PM_UPGRADE} || exit } cd_install_git () {