Compare commits

..

No commits in common. "f1d1c627714fa6bb2a1185587df5e8adfb897bf8" and "fd7230ebe3801b02ec813f1a72ca28e96b5a86e1" have entirely different histories.

25
cd.sh
View file

@ -170,9 +170,7 @@ installonly_limit=3
skip_if_unavailable=False skip_if_unavailable=False
" "
CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf"
CD_PM_HTTPS_TEXT="\ CD_PM_HTTPS_TEXT="sslverify=False"
sslverify=False
"
;; ;;
"${CD_PM_APK}") "${CD_PM_APK}")
CD_PM_CLEAN="apk cache purge" CD_PM_CLEAN="apk cache purge"
@ -184,9 +182,7 @@ sslverify=False
CD_PM_CONF_PATH="" CD_PM_CONF_PATH=""
CD_PM_CONF_TEXT="" CD_PM_CONF_TEXT=""
CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https"
CD_PM_HTTPS_TEXT="\ CD_PM_HTTPS_TEXT="--no-verify"
--no-verify
"
;; ;;
"${CD_PM_PACMAN}") "${CD_PM_PACMAN}")
CD_PM_CLEAN="pacman --sync --clean --noconfirm" CD_PM_CLEAN="pacman --sync --clean --noconfirm"
@ -198,9 +194,7 @@ sslverify=False
CD_PM_CONF_PATH="" CD_PM_CONF_PATH=""
CD_PM_CONF_TEXT="" CD_PM_CONF_TEXT=""
CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf"
CD_PM_HTTPS_TEXT="\ CD_PM_HTTPS_TEXT="SSLVerify = No"
SSLVerify = No
"
;; ;;
"${CD_PM_APT}") "${CD_PM_APT}")
CD_PM_CLEAN="apt-get clean" CD_PM_CLEAN="apt-get clean"
@ -218,9 +212,7 @@ APT::Install-Suggests False;
Dir::Etc::SourceParts \"\"; Dir::Etc::SourceParts \"\";
" "
CD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" CD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https"
CD_PM_HTTPS_TEXT="\ CD_PM_HTTPS_TEXT="Acquire::https::Verify-Peer False;"
Acquire::https::Verify-Peer False;
"
;; ;;
esac esac
cd_split cd_split
@ -573,11 +565,10 @@ cd_execute_python_module () {
local path local path
cd_step "Execute Python module" cd_step "Execute Python module"
# #
cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ cd_write "${CD_PYTHON_PACKAGES}/env.py" "$(cd_echo \
$(cd_echo CD_OS_ID CD_OS_VERSION) CD_OS_ID CD_OS_VERSION \
CD_SPLIT \
$(cd_echo CD_SPLIT) )"
"
# #
cd_split cd_split
# #