This commit is contained in:
Marc Beninca 2024-08-26 11:36:34 +02:00
parent 37d39200a0
commit 1c15f3fdf1
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F

View file

@ -405,11 +405,6 @@ SPCD_OS_OPENSUSE="opensuse"
SPCD_OS_ROCKY="rocky" SPCD_OS_ROCKY="rocky"
SPCD_OS_UBUNTU="ubuntu" SPCD_OS_UBUNTU="ubuntu"
SPCD_PF_APK="apk"
SPCD_PF_DEB="deb"
SPCD_PF_PKG="pkg"
SPCD_PF_RPM="rpm"
SPCD_PM_APK="apk" SPCD_PM_APK="apk"
SPCD_PM_APT="apt" SPCD_PM_APT="apt"
SPCD_PM_DNF="dnf" SPCD_PM_DNF="dnf"
@ -619,25 +614,9 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")"
;; ;;
*) ;; *) ;;
esac esac
# set package format
case "${SPCD_PM}" in
"${SPCD_PM_APK}")
SPCD_PF="${SPCD_PF_APK}"
;;
"${SPCD_PM_APT}")
SPCD_PF="${SPCD_PF_DEB}"
;;
"${SPCD_PM_PACMAN}")
SPCD_PF="${SPCD_PF_PKG}"
;;
"${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
SPCD_PF="${SPCD_PF_RPM}"
;;
*) ;;
esac
# set package manager variables # set package manager variables
spcd_split spcd_split
spcd_os_printenv "SPCD_PF" "SPCD_PM" spcd_os_printenv "SPCD_PM"
case "${SPCD_PM}" in case "${SPCD_PM}" in
"${SPCD_PM_DNF}") "${SPCD_PM_DNF}")
SPCD_PM_INSTALL="dnf install --assumeyes" SPCD_PM_INSTALL="dnf install --assumeyes"
@ -1196,8 +1175,8 @@ spcd_install_packages() {
spcd_install_package "rsync" spcd_install_package "rsync"
# shell check # shell check
spcd_step "ShellCheck" spcd_step "ShellCheck"
case "${SPCD_PF}" in case "${SPCD_PM}" in
"${SPCD_PF_RPM}") "${SPCD_PM_DNF}" | "${SPCD_PM_ZYPPER}")
spcd_install_package "ShellCheck" spcd_install_package "ShellCheck"
;; ;;
*) spcd_install_package "shellcheck" ;; *) spcd_install_package "shellcheck" ;;