diff --git a/spcd.sh b/spcd.sh index 34d6e52..9d1e926 100644 --- a/spcd.sh +++ b/spcd.sh @@ -28,6 +28,7 @@ spcd_main() { spcd_set_https_verification_on spcd_update_packages_catalog spcd_upgrade_packages + spcd_install_dos2unix spcd_install_git spcd_install_python # TODO move to Python @@ -206,10 +207,12 @@ ${SPCD_PROJECT_ROOT}$(basename "${GITHUB_SERVER_URL}")" # universal SPCD_DNS_FILE="/etc/resolv.conf" SPCD_PKG_CA="ca-certificates" + SPCD_PKG_DOS2UNIX="dos2unix" SPCD_PKG_GIT="git" SPCD_PYTHON_ALIAS="python3" spcd_split - spcd_echo "SPCD_DNS_FILE" "SPCD_PKG_CA" "SPCD_PKG_GIT" "SPCD_PYTHON_ALIAS" + spcd_echo "SPCD_DNS_FILE" \ + "SPCD_PKG_CA" "SPCD_PKG_DOS2UNIX" "SPCD_PKG_GIT" "SPCD_PYTHON_ALIAS" # set ca command & root case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}") @@ -587,6 +590,11 @@ spcd_upgrade_packages() { ${SPCD_PM_UPGRADE} || exit } +spcd_install_dos2unix() { + spcd_step "Install dos2unix" + spcd_install_package "${SPCD_PKG_DOS2UNIX}" +} + spcd_install_git() { spcd_step "Install Git" spcd_install_package "${SPCD_PKG_GIT}" @@ -601,9 +609,6 @@ spcd_install_python() { # TODO move to Python spcd_install_packages() { - # dos2unix - spcd_step "Install dos2unix" - spcd_install_package "dos2unix" # epel spcd_step "Install EPEL" case "${SPCD_OS_ID}" in