diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 020e210..dd0ee7d 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -669,7 +669,6 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" SPCD_PM_CLEAN="dnf clean all" SPCD_PM_INSTALL="dnf install --assumeyes" SPCD_PM_QUERY="rpm --query" - SPCD_PM_UPDATE="dnf makecache" SPCD_PKG_PKG="" SPCD_PM_CONF_PATH="/etc/dnf/dnf.conf" SPCD_PM_CONF_TEXT="\ @@ -689,7 +688,6 @@ sslverify=False SPCD_PM_CLEAN="apk cache purge" SPCD_PM_INSTALL="apk add" SPCD_PM_QUERY="apk info" - SPCD_PM_UPDATE="apk update" SPCD_PKG_PKG="" SPCD_PM_CONF_PATH="" SPCD_PM_CONF_TEXT="" @@ -702,7 +700,6 @@ sslverify=False SPCD_PM_CLEAN="pacman --sync --clean --noconfirm" SPCD_PM_INSTALL="pacman --sync --noconfirm" SPCD_PM_QUERY="pacman --query" - SPCD_PM_UPDATE="pacman --sync --refresh" SPCD_PKG_PKG="" SPCD_PM_CONF_PATH="" SPCD_PM_CONF_TEXT="" @@ -715,7 +712,6 @@ SSLVerify = No SPCD_PM_CLEAN="apt-get clean" SPCD_PM_INSTALL="apt-get install --assume-yes" SPCD_PM_QUERY="dpkg-query --show" - SPCD_PM_UPDATE="apt-get update" SPCD_PKG_PKG="apt-utils" SPCD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" SPCD_PM_CONF_TEXT="\ @@ -734,7 +730,6 @@ Acquire::https::Verify-Peer False; SPCD_PM_CLEAN="zypper clean" SPCD_PM_INSTALL="zypper --non-interactive install" SPCD_PM_QUERY="rpm --query" - SPCD_PM_UPDATE="zypper refresh" SPCD_PKG_PKG="" SPCD_PM_CONF_PATH="" SPCD_PM_CONF_TEXT="\ @@ -747,7 +742,7 @@ Acquire::https::Verify-Peer False; esac spcd_split spcd_os_printenv "SPCD_PM_CLEAN" \ - "SPCD_PM_INSTALL" "SPCD_PM_QUERY" "SPCD_PM_UPDATE" + "SPCD_PM_INSTALL" "SPCD_PM_QUERY" spcd_split spcd_os_printenv "SPCD_PKG_PKG" "SPCD_PM_CONF_PATH" "SPCD_PM_HTTPS_PATH" # specific @@ -1026,7 +1021,14 @@ spcd_packages_trust_https() { spcd_packages_update_catalog() { spcd_step "Update catalog" - ${SPCD_PM_UPDATE} + case "${SPCD_PM}" in + "${SPCD_PM_APK}") apk update ;; + "${SPCD_PM_APT}") apt-get update ;; + "${SPCD_PM_DNF}") dnf makecache ;; + "${SPCD_PM_PACMAN}") pacman --sync --refresh ;; + "${SPCD_PM_ZYPPER}") zypper refresh ;; + *) ;; + esac } spcd_packages_install_tools() {