diff --git a/cd.sh b/cd.sh index c6c9e61..7fe0fd1 100644 --- a/cd.sh +++ b/cd.sh @@ -69,9 +69,9 @@ cd_set_environment_variables () { CD_CMD_CLEAN="dnf clean all" CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" - CD_FILE_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" - CD_FILE_HTTPS_TEXT="sslverify=False" CD_PKG_PKG="" + CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" + CD_PM_HTTPS_TEXT="sslverify=False" CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3.11" CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" @@ -90,9 +90,9 @@ cd_set_environment_variables () { CD_CMD_CLEAN="apt-get clean" CD_CMD_UPDATE="apt-get update" CD_CMD_UPGRADE="apt-get upgrade --assume-yes" - CD_FILE_HTTPS_PATH="/etc/apt/apt.conf.d/https" - CD_FILE_HTTPS_TEXT="Acquire::https::Verify-Peer False;" CD_PKG_PKG="apt-utils" + CD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" + CD_PM_HTTPS_TEXT="Acquire::https::Verify-Peer False;" CD_PYTHON_COMMAND="python3" CD_PYTHON_PACKAGE="python3" CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" @@ -206,8 +206,8 @@ Dir::Etc::SourceParts \"\"; cd_set_https_verification_off () { if [ "${CD_CA}" -o "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] ; then cd_step "Set HTTPS verification off" - cd_mkdir "$(dirname "${CD_FILE_HTTPS_PATH}")" - cd_write "${CD_FILE_HTTPS_PATH}" "${CD_FILE_HTTPS_TEXT}" + cd_mkdir "$(dirname "${CD_PM_HTTPS_PATH}")" + cd_write "${CD_PM_HTTPS_PATH}" "${CD_PM_HTTPS_TEXT}" fi } @@ -248,7 +248,7 @@ cd_update_ca_certificates () { cd_set_https_verification_on () { if [ "${CD_CA}" -o "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] ; then cd_step "Set HTTPS verification on" - cd_rm "${CD_FILE_HTTPS_PATH}" + cd_rm "${CD_PM_HTTPS_PATH}" fi }