From cf446063a90f6973de7ba7ca3e23fd544cfdc3fd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 00:03:04 +0200 Subject: [PATCH 1/3] install --- cd.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index a9b5700..8424c29 100644 --- a/cd.sh +++ b/cd.sh @@ -67,6 +67,7 @@ cd_set_environment_variables () { 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_PKG_PKG="" @@ -97,6 +98,7 @@ skip_if_unavailable=False CD_CA_ROOT="/usr/local/share/ca-certificates" CD_CMD_CA="update-ca-certificates" CD_CMD_CLEAN="apt-get clean" + CD_CMD_INSTALL="apt-get install --assume-yes" CD_CMD_UPDATE="apt-get update" CD_CMD_UPGRADE="apt-get upgrade --assume-yes" CD_PKG_PKG="apt-utils" @@ -354,10 +356,7 @@ local variable="${1}" cd_install_package () { if [ "${1}" ] ; then - case "${CD_OS_ID}" in - "${CD_OS_DEBIAN}") apt-get install --assume-yes "${1}" || exit ;; - "${CD_OS_ALMA}") dnf install --assumeyes "${1}" || exit ;; - esac + ${CD_CMD_INSTALL} "${1}" || exit fi } From 9070ae93774539fcb8cbbefcb4d91aa1fc304f61 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 00:24:14 +0200 Subject: [PATCH 2/3] cd_ln_python --- cd.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cd.sh b/cd.sh index 8424c29..c8b6d53 100644 --- a/cd.sh +++ b/cd.sh @@ -264,6 +264,8 @@ cd_install_git () { cd_install_python () { cd_step "Install Python" cd_install_package "${CD_PYTHON_PACKAGE}" + cd_split + cd_ln_python "${CD_PYTHON_COMMAND}" } cd_clean_packages_cache () { @@ -360,6 +362,13 @@ cd_install_package () { fi } +cd_ln_python () { + if [ "${1}" ] ; then + echo "python3 → ${1}" + ln --force --symbolic "${1}" "/usr/bin/python3" || exit + fi +} + cd_mkdir () { if [ "${1}" ] ; then echo "→ ${1}" From ea49325b9fb5dbba6119bf7e7c0b60fbac203682 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 4 May 2024 00:28:49 +0200 Subject: [PATCH 3/3] deb/py --- cd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index c8b6d53..b7c7e02 100644 --- a/cd.sh +++ b/cd.sh @@ -92,7 +92,8 @@ skip_if_unavailable=False CD_OS_REPO="${CD_DEFAULT_REPO_DEBIAN}" [ "${CD_REPO_DEBIAN}" ] && CD_OS_REPO="${CD_REPO_DEBIAN}" case "${CD_OS_VERSION}" in - "bookworm"|"bullseye") cd_nop ;; + "bookworm") CD_PYTHON_COMMAND="python3.11" ;; + "bullseye") CD_PYTHON_COMMAND="python3.9" ;; *) cd_error_os "CD_OS_VERSION" ;; esac CD_CA_ROOT="/usr/local/share/ca-certificates" @@ -112,7 +113,6 @@ Dir::Etc::SourceParts \"\"; " 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" ;;