diff --git a/spcd.sh b/spcd.sh index f247c80..e0b96bc 100644 --- a/spcd.sh +++ b/spcd.sh @@ -423,6 +423,8 @@ Acquire::https::Verify-Peer False; ;; *) ;; esac + spcd_split + spcd_echo "SPCD_PYTHON_COMMAND" "SPCD_PYTHON_PACKAGE" # set python packages case "${SPCD_OS_ID}" in "${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}") @@ -436,8 +438,10 @@ Acquire::https::Verify-Peer False; ;; *) ;; esac + SPCD_PYTHON_VENV_PACKAGES="\ +${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" spcd_split - spcd_echo "SPCD_PYTHON_COMMAND" "SPCD_PYTHON_PACKAGE" "SPCD_PYTHON_PACKAGES" + spcd_echo "SPCD_PYTHON_PACKAGES" "SPCD_PYTHON_VENV_PACKAGES" # variables [ -n "${SPCD_CA_1}" ] && SPCD_CA=true # @@ -719,8 +723,7 @@ index-url = ${SPCD_URL_PYTHON} spcd_install_python_modules() { spcd_step "Install Python modules" spcd_ipm__root="$(mktemp --directory)" || exit - spcd_ipm__target="\ -${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" + spcd_ipm__target="${SPCD_PYTHON_VENV_PACKAGES}" echo "→ ${spcd_ipm__root}" for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do case "${spcd_ipm__repository}" in @@ -759,7 +762,7 @@ ${spcd_ipm__target}" fi done spcd_split - spcd_ls "${SPCD_PYTHON_PACKAGES}" + spcd_ls "${spcd_ipm__target}" spcd_split spcd_rm "${spcd_ipm__root}" } @@ -774,7 +777,7 @@ spcd_write_python_module() { spcd_wpm__text="${spcd_wpm__text}${spcd_wpm__value} " done - spcd_write "${SPCD_PYTHON_PACKAGES}/env.py" "${spcd_wpm__text} + spcd_write "${SPCD_PYTHON_VENV_PACKAGES}/env.py" "${spcd_wpm__text} SPCD_STEP = $((SPCD_STEP + 1)) " }