From 1e0ddbe9402aa616aaf08d5c64d5808686922d26 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 13:23:16 +0200 Subject: [PATCH] wip/pkg --- cd.sh | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/cd.sh b/cd.sh index 3f3eb25..a9abcce 100644 --- a/cd.sh +++ b/cd.sh @@ -90,33 +90,27 @@ skip_if_unavailable=False CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" ;; "${CD_OS_ALPINE}") - CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" - [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" + CD_OS_REPO="${CD_DEFAULT_REPO_ALPINE}" + [ "${CD_REPO_ALPINE}" ] && CD_OS_REPO="${CD_REPO_ALPINE}" case "${CD_OS_VERSION}" in - "8"|"9") ;; + "3.18"|"3.19") ;; *) cd_error_os "CD_OS_VERSION" ;; esac - CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" - CD_CMD_CA="update-ca-trust" - CD_CMD_CLEAN="dnf clean all" - CD_CMD_INSTALL="dnf install --assumeyes" - CD_CMD_UPDATE="dnf makecache" - CD_CMD_UPGRADE="dnf upgrade --assumeyes" + CD_CA_ROOT="/usr/local/share/ca-certificates" + CD_CMD_CA="update-ca-certificates" + CD_CMD_CLEAN="apk cache purge" + CD_CMD_INSTALL="apk add" + CD_CMD_UPDATE="apk update" + CD_CMD_UPGRADE="apk upgrade" CD_PKG_PKG="" - CD_PM_CONF_PATH="/etc/dnf/dnf.conf" - CD_PM_CONF_TEXT="\ -[main] -best=True -clean_requirements_on_remove=True -gpgcheck=1 -installonly_limit=3 -skip_if_unavailable=False -" + # TODO + CD_PM_CONF_PATH="" + CD_PM_CONF_TEXT="" 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" + CD_PYTHON_PACKAGE="python3" + CD_PYTHON_PACKAGES="/usr/lib/python3.11/site-packages" ;; "${CD_OS_DEBIAN}") export DEBIAN_FRONTEND="noninteractive"