This commit is contained in:
Marc Beninca 2024-09-07 12:26:18 +02:00
parent 516c18ca51
commit 1fa2c9f34b
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F

View file

@ -259,7 +259,7 @@ nameserver ${value}
fi fi
} }
spcd_eval() { spcd_run() {
if [ -n "${1}" ]; then if [ -n "${1}" ]; then
_spcd_frame_open "${@}" _spcd_frame_open "${@}"
"${@}" "${@}"
@ -981,7 +981,7 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET}
done done
;; ;;
"list") "list")
if ! spcd_eval locale --all-locales; then if ! spcd_run locale --all-locales; then
echo "No locales yet!" echo "No locales yet!"
fi fi
;; ;;
@ -995,11 +995,11 @@ ${name}.${_SPCD_TXT_CHARSET} ${_SPCD_TXT_CHARSET}
spcd_f_pm_clean() { spcd_f_pm_clean() {
case "${SPCD_PM}" in case "${SPCD_PM}" in
"${SPCD_PM_APK}") spcd_eval apk cache purge ;; "${SPCD_PM_APK}") spcd_run apk cache purge ;;
"${SPCD_PM_APT}") spcd_eval apt-get clean ;; "${SPCD_PM_APT}") spcd_run apt-get clean ;;
"${SPCD_PM_DNF}") spcd_eval dnf clean all ;; "${SPCD_PM_DNF}") spcd_run dnf clean all ;;
"${SPCD_PM_PACMAN}") spcd_eval pacman --sync --clean --noconfirm ;; "${SPCD_PM_PACMAN}") spcd_run pacman --sync --clean --noconfirm ;;
"${SPCD_PM_ZYPPER}") spcd_eval zypper clean ;; "${SPCD_PM_ZYPPER}") spcd_run zypper clean ;;
*) ;; *) ;;
esac esac
} }
@ -1017,11 +1017,11 @@ spcd_f_pm_https() {
spcd_f_pm_install() { spcd_f_pm_install() {
case "${SPCD_PM}" in case "${SPCD_PM}" in
"${SPCD_PM_APK}") spcd_eval apk add "${1}" ;; "${SPCD_PM_APK}") spcd_run apk add "${1}" ;;
"${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;; "${SPCD_PM_APT}") spcd_run apt-get install --assume-yes "${1}" ;;
"${SPCD_PM_DNF}") spcd_eval dnf install --assumeyes "${1}" ;; "${SPCD_PM_DNF}") spcd_run dnf install --assumeyes "${1}" ;;
"${SPCD_PM_PACMAN}") spcd_eval pacman --sync --noconfirm "${1}" ;; "${SPCD_PM_PACMAN}") spcd_run pacman --sync --noconfirm "${1}" ;;
"${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;; "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive install "${1}" ;;
*) ;; *) ;;
esac esac
spcd_f_pm_clean spcd_f_pm_clean
@ -1222,7 +1222,7 @@ Dir::Etc::SourceParts \"\";
esac esac
case "${SPCD_OS_ID}" in case "${SPCD_OS_ID}" in
"${SPCD_OS_ARCH}") "${SPCD_OS_ARCH}")
spcd_eval pacman-key --init spcd_run pacman-key --init
;; ;;
"${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}")
export DEBIAN_FRONTEND="noninteractive" export DEBIAN_FRONTEND="noninteractive"
@ -1264,11 +1264,11 @@ SSLVerify = No
spcd_step__packages_update_catalog() { spcd_step__packages_update_catalog() {
spcd_step "Update catalog" spcd_step "Update catalog"
case "${SPCD_PM}" in case "${SPCD_PM}" in
"${SPCD_PM_APK}") spcd_eval apk update ;; "${SPCD_PM_APK}") spcd_run apk update ;;
"${SPCD_PM_APT}") spcd_eval apt-get update ;; "${SPCD_PM_APT}") spcd_run apt-get update ;;
"${SPCD_PM_DNF}") spcd_eval dnf makecache ;; "${SPCD_PM_DNF}") spcd_run dnf makecache ;;
"${SPCD_PM_PACMAN}") spcd_eval pacman --sync --refresh ;; "${SPCD_PM_PACMAN}") spcd_run pacman --sync --refresh ;;
"${SPCD_PM_ZYPPER}") spcd_eval zypper refresh ;; "${SPCD_PM_ZYPPER}") spcd_run zypper refresh ;;
*) ;; *) ;;
esac esac
} }
@ -1330,13 +1330,13 @@ spcd_step__ca_update_certificates() {
"${SPCD_OS_ALMA}" | \ "${SPCD_OS_ALMA}" | \
"${SPCD_OS_FEDORA}" | \ "${SPCD_OS_FEDORA}" | \
"${SPCD_OS_ROCKY}") "${SPCD_OS_ROCKY}")
spcd_eval update-ca-trust spcd_run update-ca-trust
;; ;;
"${SPCD_OS_ALPINE}" | \ "${SPCD_OS_ALPINE}" | \
"${SPCD_OS_DEBIAN}" | \ "${SPCD_OS_DEBIAN}" | \
"${SPCD_OS_OPENSUSE}" | \ "${SPCD_OS_OPENSUSE}" | \
"${SPCD_OS_UBUNTU}") "${SPCD_OS_UBUNTU}")
spcd_eval update-ca-certificates spcd_run update-ca-certificates
;; ;;
*) ;; *) ;;
esac esac
@ -1358,11 +1358,11 @@ spcd_step__packages_verify_https() {
spcd_step__packages_upgrade_system() { spcd_step__packages_upgrade_system() {
spcd_step "Upgrade system" spcd_step "Upgrade system"
case "${SPCD_PM}" in case "${SPCD_PM}" in
"${SPCD_PM_APK}") spcd_eval apk upgrade ;; "${SPCD_PM_APK}") spcd_run apk upgrade ;;
"${SPCD_PM_APT}") spcd_eval apt-get upgrade --assume-yes ;; "${SPCD_PM_APT}") spcd_run apt-get upgrade --assume-yes ;;
"${SPCD_PM_DNF}") spcd_eval dnf upgrade --assumeyes ;; "${SPCD_PM_DNF}") spcd_run dnf upgrade --assumeyes ;;
"${SPCD_PM_PACMAN}") spcd_eval pacman --sync --sysupgrade --noconfirm ;; "${SPCD_PM_PACMAN}") spcd_run pacman --sync --sysupgrade --noconfirm ;;
"${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive update ;; "${SPCD_PM_ZYPPER}") spcd_run zypper --non-interactive update ;;
*) ;; *) ;;
esac esac
} }