From ee1cb0af52acfd51231774674a01dde508debc6f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 12:43:45 +0200 Subject: [PATCH] copy git cloned packages into venv instead of system --- spcd.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/spcd.sh b/spcd.sh index 18ae599..d081c44 100644 --- a/spcd.sh +++ b/spcd.sh @@ -706,13 +706,6 @@ index-url = ${SPCD_URL_PYTHON} spcd_split "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_VENV}" spcd_split - for spcd_ip__name in "spcd" "rwx"; do - rsync --archive --verbose \ - "${SPCD_PYTHON_PACKAGES}/${spcd_ip__name}/" \ - "\ -${SPCD_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages/${spcd_ip__name}/" - done - spcd_split . "${SPCD_VENV}/bin/activate" spcd_split pip install --upgrade "pip" @@ -726,6 +719,7 @@ ${SPCD_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages/${spcd_ip__name}/" spcd_install_python_modules() { spcd_step "Install Python modules" spcd_ipm__root="$(mktemp --directory)" || exit + spcd_ipm__target="${SPCD_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" echo "→ ${spcd_ipm__root}" for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do case "${spcd_ipm__repository}" in @@ -747,8 +741,8 @@ ${spcd_ipm__url} echo "\ ${spcd_ipm__path} ↓ -${SPCD_PYTHON_PACKAGES}" - cp --recursive "${spcd_ipm__path}" "${SPCD_PYTHON_PACKAGES}" || +${spcd_ipm__target}" + cp --recursive "${spcd_ipm__path}" "${spcd_ipm__target}" || exit # check matching of file and variable spcd_ipm__script="${spcd_ipm__root}/${spcd_ipm__name}/spcd.sh"