From 1104b415c2b3d99f300e4561bbbe5517a724bba0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 3 Jun 2024 21:00:28 +0200 Subject: [PATCH 1/3] lf/https --- cd.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index 64e8088..9713c98 100644 --- a/cd.sh +++ b/cd.sh @@ -170,7 +170,9 @@ installonly_limit=3 skip_if_unavailable=False " CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" - CD_PM_HTTPS_TEXT="sslverify=False" + CD_PM_HTTPS_TEXT="\ +sslverify=False +" ;; "${CD_PM_APK}") CD_PM_CLEAN="apk cache purge" @@ -182,7 +184,9 @@ skip_if_unavailable=False CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" CD_PM_HTTPS_PATH="/etc/apk/repositories.d/https" - CD_PM_HTTPS_TEXT="--no-verify" + CD_PM_HTTPS_TEXT="\ +--no-verify +" ;; "${CD_PM_PACMAN}") CD_PM_CLEAN="pacman --sync --clean --noconfirm" @@ -194,7 +198,9 @@ skip_if_unavailable=False CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" CD_PM_HTTPS_PATH="/etc/pacman.d/https.conf" - CD_PM_HTTPS_TEXT="SSLVerify = No" + CD_PM_HTTPS_TEXT="\ +SSLVerify = No +" ;; "${CD_PM_APT}") CD_PM_CLEAN="apt-get clean" @@ -212,7 +218,9 @@ APT::Install-Suggests False; Dir::Etc::SourceParts \"\"; " CD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" - CD_PM_HTTPS_TEXT="Acquire::https::Verify-Peer False;" + CD_PM_HTTPS_TEXT="\ +Acquire::https::Verify-Peer False; +" ;; esac cd_split From 2106a7ea9357f3c845b1dba0395e34fc497592ad Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 4 Jun 2024 09:18:54 +0200 Subject: [PATCH 2/3] lf --- cd.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index 9713c98..34f8e8d 100644 --- a/cd.sh +++ b/cd.sh @@ -573,10 +573,10 @@ cd_execute_python_module () { local path cd_step "Execute Python module" # - cd_write "${CD_PYTHON_PACKAGES}/env.py" "$(cd_echo \ - CD_OS_ID CD_OS_VERSION \ - CD_SPLIT \ - )" + cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ +$(cd_echo CD_OS_ID CD_OS_VERSION) +$(cd_echo CD_SPLIT) +" # cd_split # From f1d1c627714fa6bb2a1185587df5e8adfb897bf8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 4 Jun 2024 10:09:41 +0200 Subject: [PATCH 3/3] empty --- cd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cd.sh b/cd.sh index 34f8e8d..e46fdb5 100644 --- a/cd.sh +++ b/cd.sh @@ -575,6 +575,7 @@ local path # cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ $(cd_echo CD_OS_ID CD_OS_VERSION) + $(cd_echo CD_SPLIT) " #