rwx.work/spcd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pm/tools

Browse source
This commit is contained in:
Marc Beninca 2024-08-26 11:29:30 +02:00
parent 6df1d883ca
commit 37d39200a0
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
spcd/bootstrap.sh
View file

@ -642,7 +642,6 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
"${SPCD_PM_DNF}") "${SPCD_PM_DNF}")
SPCD_PM_INSTALL="dnf install --assumeyes" SPCD_PM_INSTALL="dnf install --assumeyes"
SPCD_PM_QUERY="rpm --query" SPCD_PM_QUERY="rpm --query"
SPCD_PKG_PKG=""
SPCD_PM_CONF_PATH="/etc/dnf/dnf.conf" SPCD_PM_CONF_PATH="/etc/dnf/dnf.conf"
SPCD_PM_CONF_TEXT="\ SPCD_PM_CONF_TEXT="\
[main] [main]
@ -660,7 +659,6 @@ sslverify=False
"${SPCD_PM_APK}") "${SPCD_PM_APK}")
SPCD_PM_INSTALL="apk add" SPCD_PM_INSTALL="apk add"
SPCD_PM_QUERY="apk info" SPCD_PM_QUERY="apk info"
SPCD_PKG_PKG=""
SPCD_PM_CONF_PATH="" SPCD_PM_CONF_PATH=""
SPCD_PM_CONF_TEXT="" SPCD_PM_CONF_TEXT=""
SPCD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" SPCD_PM_HTTPS_PATH="/etc/apk/repositories.d/https"
@ -671,7 +669,6 @@ sslverify=False
"${SPCD_PM_PACMAN}") "${SPCD_PM_PACMAN}")
SPCD_PM_INSTALL="pacman --sync --noconfirm" SPCD_PM_INSTALL="pacman --sync --noconfirm"
SPCD_PM_QUERY="pacman --query" SPCD_PM_QUERY="pacman --query"
SPCD_PKG_PKG=""
SPCD_PM_CONF_PATH="" SPCD_PM_CONF_PATH=""
SPCD_PM_CONF_TEXT="" SPCD_PM_CONF_TEXT=""
SPCD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" SPCD_PM_HTTPS_PATH="/etc/pacman.d/https.conf"
@ -682,7 +679,6 @@ SSLVerify = No
"${SPCD_PM_APT}") "${SPCD_PM_APT}")
SPCD_PM_INSTALL="apt-get install --assume-yes" SPCD_PM_INSTALL="apt-get install --assume-yes"
SPCD_PM_QUERY="dpkg-query --show" SPCD_PM_QUERY="dpkg-query --show"
SPCD_PKG_PKG="apt-utils"
SPCD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" SPCD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf"
SPCD_PM_CONF_TEXT="\ SPCD_PM_CONF_TEXT="\
Acquire::Check-Valid-Until True; Acquire::Check-Valid-Until True;
@ -699,7 +695,6 @@ Acquire::https::Verify-Peer False;
"${SPCD_PM_ZYPPER}") "${SPCD_PM_ZYPPER}")
SPCD_PM_INSTALL="zypper --non-interactive install" SPCD_PM_INSTALL="zypper --non-interactive install"
SPCD_PM_QUERY="rpm --query" SPCD_PM_QUERY="rpm --query"
SPCD_PKG_PKG=""
SPCD_PM_CONF_PATH="" SPCD_PM_CONF_PATH=""
SPCD_PM_CONF_TEXT="\ SPCD_PM_CONF_TEXT="\
" "
@ -712,7 +707,7 @@ Acquire::https::Verify-Peer False;
spcd_split spcd_split
spcd_os_printenv "SPCD_PM_INSTALL" "SPCD_PM_QUERY" spcd_os_printenv "SPCD_PM_INSTALL" "SPCD_PM_QUERY"
spcd_split spcd_split
spcd_os_printenv "SPCD_PKG_PKG" "SPCD_PM_CONF_PATH" "SPCD_PM_HTTPS_PATH" spcd_os_printenv "SPCD_PM_CONF_PATH" "SPCD_PM_HTTPS_PATH"
# specific # specific
case "${SPCD_OS_ID}" in case "${SPCD_OS_ID}" in
"${SPCD_OS_ALMA}") "${SPCD_OS_ALMA}")
@ -1012,7 +1007,10 @@ spcd_packages_update_catalog() {
spcd_packages_install_tools() { spcd_packages_install_tools() {
spcd_step "Install tools" spcd_step "Install tools"
spcd_install_package "${SPCD_PKG_PKG}" case "${SPCD_PM}" in
"${SPCD_PM_APT}") spcd_install_package "apt-utils" ;;
*) ;;
esac
} }
# ╭───────┬────╮ # ╭───────┬────╮