diff --git a/spcd.sh b/spcd.sh index 331dea6..59ceab2 100644 --- a/spcd.sh +++ b/spcd.sh @@ -714,30 +714,24 @@ index-url = ${SPCD_URL_PYTHON} spcd_install_python_modules() { spcd_step "Install Python modules" spcd_ipm__target="${SPCD_PYTHON_VENV_PACKAGES}" - for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do + spcd_ls "${spcd_ipm__target}" + spcd_split + spcd_ipm__path="$(spcd_pip_install "${SPCD_GIT_MAIN}")" + # check matching of file and variable + spcd_ipm__script="${spcd_ipm__path}/main.sh" + if [ -f "${spcd_ipm__script}" ]; then spcd_split - spcd_ipm__path="$(spcd_git_clone "${spcd_ipm__repository}")" - spcd_ipm__name="$(basename "${spcd_ipm__path}")" - spcd_ipm__path="${spcd_ipm__path}/${spcd_ipm__name}" - echo "\ -${spcd_ipm__path} -↓ -${spcd_ipm__target}" - cp --recursive "${spcd_ipm__path}" "${spcd_ipm__target}" || - exit - # check matching of file and variable - spcd_ipm__script="${SPCD_DL}/${spcd_ipm__name}/spcd.sh" - if [ -f "${spcd_ipm__script}" ]; then - spcd_split - spcd_ipm__check="${SPCD_DL}/check.${SPCD_CMD_SUM}" - "${SPCD_CMD_SUM}" "${spcd_ipm__script}" >"${spcd_ipm__check}" - printf "%s" "${SPCD}" >"${spcd_ipm__script}" - ls -l "${spcd_ipm__script}" - dos2unix "${spcd_ipm__script}" - ls -l "${spcd_ipm__script}" - "${SPCD_CMD_SUM}" -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" - fi - done + ls -l "${spcd_ipm__script}" + spcd_ipm__check="${spcd_ipm__script}.${SPCD_CMD_SUM}" + "${SPCD_CMD_SUM}" "${spcd_ipm__script}" >"${spcd_ipm__check}" + printf "%s" "${SPCD}" >"${spcd_ipm__script}" + ls -l "${spcd_ipm__script}" + dos2unix "${spcd_ipm__script}" + ls -l "${spcd_ipm__script}" + "${SPCD_CMD_SUM}" -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" + fi + spcd_split + spcd_pip_install "${SPCD_GIT_ROOT}" spcd_split spcd_ls "${spcd_ipm__target}" } @@ -954,6 +948,21 @@ spcd_openssl() { fi } +spcd_pip_install() { + if [ -n "${1}" ]; then + spcd_pi__name="$(basename "${1}")" + spcd_pi__path="$(spcd_git_clone "${1}")" + spcd_pi__path="${spcd_pi__path}/${spcd_pi__name}" + spcd_pi__target="${SPCD_PYTHON_VENV_PACKAGES}" + echo "\ +${spcd_pi__path} +↓ +${spcd_pi__target}" + cp --recursive "${spcd_pi__path}" "${spcd_pi__target}" + echo "${spcd_pi__target}/${spcd_pi__name}" + fi +} + spcd_rm() { spcd_rm__path="${1}" if [ -e "${spcd_rm__path}" ]; then