From ccd946432906b69cf8b82b8d2c8075b221a698a1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 16:30:40 +0200 Subject: [PATCH] universal --- cd.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cd.sh b/cd.sh index 984bbe0..88d7d0c 100644 --- a/cd.sh +++ b/cd.sh @@ -41,7 +41,7 @@ cd_main () { cd_set_environment_variables () { cd_step "Set environment variables" - # + # operating system case "$(cd_grep_os ID)" in "almalinux") CD_OS_ID="${CD_OS_ALMA}" @@ -58,7 +58,7 @@ cd_set_environment_variables () { CD_OS_VERSION="$(cd_grep_os VERSION_CODENAME)" ;; esac - # + # universal CD_DNS_FILE="/etc/resolv.conf" CD_PKG_CA="ca-certificates" CD_PKG_GIT="git" @@ -166,7 +166,6 @@ Dir::Etc::SourceParts \"\"; # unsupported cd_error_ci "ΓΈ" fi - # [ "${CD_SERVER_URL}" ] || cd_error_ci "CD_SERVER_URL" [ "${CD_PROJECTS_GROUP}" ] || cd_error_ci "CD_PROJECTS_GROUP" [ "${CD_PROJECT_NAME}" ] || cd_error_ci "CD_PROJECT_NAME" @@ -175,16 +174,16 @@ Dir::Etc::SourceParts \"\"; CD_PROJECTS_URL="${CD_SERVER_URL}/${CD_PROJECTS_GROUP}" CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" # - cd_echo "CD_CA_ROOT" - cd_split cd_echo "CD_OS_ID" "CD_OS_VERSION" cd_split + cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" + cd_split + cd_echo "CD_CA_ROOT" + cd_split cd_echo "CD_CMD_CA" \ "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE" cd_split - cd_echo "CD_DNS_FILE" - cd_split - cd_echo "CD_PKG_CA" "CD_PKG_GIT" "CD_PKG_PKG" + cd_echo "CD_PKG_PKG" cd_split cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH" cd_split