From 79939a09e6df5116d49af7bd1469bf5ecc401f9e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 6 May 2024 11:45:21 +0200 Subject: [PATCH] pypackages --- cd.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cd.sh b/cd.sh index 69d4f12..4f96e18 100644 --- a/cd.sh +++ b/cd.sh @@ -250,17 +250,14 @@ Dir::Etc::SourceParts \"\"; "${CD_OS_ALMA}"|"${CD_OS_ROCKY}") CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3.11" - CD_PYTHON_PACKAGES="/usr/lib64/python3.11/site-packages" ;; "${CD_OS_ALPINE}") CD_PYTHON_COMMAND="python3.11" CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib/python3.11/site-packages" ;; "${CD_OS_ARCH}") CD_PYTHON_COMMAND="python3.12" CD_PYTHON_PACKAGE="python" - CD_PYTHON_PACKAGES="/usr/lib/python3.12/site-packages" ;; "${CD_OS_DEBIAN}") case "${CD_OS_VERSION}" in @@ -268,12 +265,10 @@ Dir::Etc::SourceParts \"\"; "bullseye") CD_PYTHON_COMMAND="python3.9" ;; esac CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; "${CD_OS_FEDORA}") CD_PYTHON_COMMAND="python3.12" CD_PYTHON_PACKAGE="python3" - CD_PYTHON_PACKAGES="/usr/lib64/python3.12/site-packages" ;; "${CD_OS_UBUNTU}") case "${CD_OS_VERSION}" in @@ -281,6 +276,16 @@ Dir::Etc::SourceParts \"\"; "mantic") CD_PYTHON_COMMAND="python3.11" ;; esac CD_PYTHON_PACKAGE="python3" + ;; + esac + case "${CD_OS_ID}" in + "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") + CD_PYTHON_PACKAGES="/usr/lib64/${CD_PYTHON_COMMAND}/site-packages" + ;; + "${CD_OS_ALPINE}"|"${CD_OS_ARCH}") + CD_PYTHON_PACKAGES="/usr/lib/${CD_PYTHON_COMMAND}/site-packages" + ;; + "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; esac