From e13ffce6918eaa70d5be97d6d7497119454cd2c1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 23 May 2024 20:19:11 +0200 Subject: [PATCH] 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 }