From 8b9ddbec9fd3443242ec05d151d19bc0efb4941a Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Fri, 3 May 2024 21:36:19 +0200
Subject: [PATCH] https

---
 cd.sh | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/cd.sh b/cd.sh
index a0eeae7..eb67a13 100644
--- a/cd.sh
+++ b/cd.sh
@@ -69,7 +69,8 @@ cd_set_environment_variables () {
             CD_CMD_CLEAN="dnf clean all"
             CD_CMD_UPDATE="dnf makecache"
             CD_CMD_UPGRADE="dnf upgrade --assumeyes"
-            CD_FILE_HTTPS="/etc/dnf/dnf.conf.d/https.conf"
+            CD_FILE_HTTPS_NAME="/etc/dnf/dnf.conf.d/https.conf"
+            CD_FILE_HTTPS_TEXT="sslverify=False"
             CD_PYTHON_COMMAND="python3.11"
             CD_PYTHON_PACKAGE="python3.11"
             CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages"
@@ -86,7 +87,8 @@ 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="/etc/apt/apt.conf.d/https"
+            CD_FILE_HTTPS_NAME="/etc/apt/apt.conf.d/https"
+            CD_FILE_HTTPS_TEXT="Acquire::https::Verify-Peer False;"
             CD_PYTHON_COMMAND="python3"
             CD_PYTHON_PACKAGE="python3"
             CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages"
@@ -190,18 +192,7 @@ 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"
-        case "${CD_OS_ID}" in
-            "${CD_OS_ALMA}")
-                cd_write "${CD_FILE_HTTPS}" "\
-sslverify=False
-"
-            ;;
-            "${CD_OS_DEBIAN}")
-                cd_write "${CD_FILE_HTTPS}" "\
-Acquire::https::Verify-Peer False;
-"
-            ;;
-        esac
+        cd_write "${CD_FILE_HTTPS_NAME}" "${CD_FILE_HTTPS_TEXT}"
     fi
 }
 
@@ -247,7 +238,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}"
+        cd_rm "${CD_FILE_HTTPS_NAME}"
     fi
 }