From fd9f8a49007d3e9bc15b7d730473c51eb3bda34d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 19:08:03 +0200 Subject: [PATCH 1/4] make switching log path agnostic --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 578a38a..62ba35b 100644 --- a/spcd.sh +++ b/spcd.sh @@ -789,7 +789,7 @@ spcd_switch_to_python() { echo "\ ${SPCD_PATH} ↓ -${SPCD_PYTHON_PACKAGES}/${spcd_stp__name}" +${SPCD_PYTHON_ALIAS} / ${spcd_stp__name}" "${SPCD_PYTHON_ALIAS}" -m "${spcd_stp__name}" } From 0d6cf1917c6978d0774d5dc7bae6798afafeb2c2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 19:12:14 +0200 Subject: [PATCH 2/4] install python modules before packages --- spcd.sh | 96 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/spcd.sh b/spcd.sh index 62ba35b..6b73502 100644 --- a/spcd.sh +++ b/spcd.sh @@ -30,9 +30,9 @@ spcd_main() { spcd_upgrade_packages spcd_install_git spcd_install_python + spcd_install_python_modules # TODO move to Python spcd_install_packages - spcd_install_python_modules spcd_write_python_module spcd_switch_to_python } @@ -599,6 +599,53 @@ spcd_install_python() { spcd_ln_python "${SPCD_PYTHON_COMMAND}" } +spcd_install_python_modules() { + spcd_step "Install Python modules" + spcd_ipm__root="$(mktemp --directory)" || exit + 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 + http*) spcd_ipm__url="${spcd_ipm__repository}" ;; + */*) spcd_ipm__url="${SPCD_PROJECT_ROOT}/${spcd_ipm__repository}" ;; + *) spcd_ipm__url="\ +${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${spcd_ipm__repository}" ;; + esac + spcd_ipm__name="$(basename "${spcd_ipm__url}")" + spcd_split + echo "\ +${spcd_ipm__url} +↓" + git clone \ + "${spcd_ipm__url}" \ + "${spcd_ipm__root}/${spcd_ipm__name}" || + exit + spcd_ipm__path="${spcd_ipm__root}/${spcd_ipm__name}/${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_ipm__root}/${spcd_ipm__name}/spcd.sh" + if [ -f "${spcd_ipm__script}" ]; then + spcd_split + spcd_ipm__check="${spcd_ipm__root}/check.sha512sum" + sha512sum "${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}" + sha512sum -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" + fi + done + spcd_split + spcd_ls "${spcd_ipm__target}" + spcd_split + spcd_rm "${spcd_ipm__root}" +} + # TODO move to Python spcd_install_packages() { # dos2unix @@ -720,53 +767,6 @@ index-url = ${SPCD_URL_PYTHON} "sphinx" "sphinx-rtd-theme" } -spcd_install_python_modules() { - spcd_step "Install Python modules" - spcd_ipm__root="$(mktemp --directory)" || exit - 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 - http*) spcd_ipm__url="${spcd_ipm__repository}" ;; - */*) spcd_ipm__url="${SPCD_PROJECT_ROOT}/${spcd_ipm__repository}" ;; - *) spcd_ipm__url="\ -${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${spcd_ipm__repository}" ;; - esac - spcd_ipm__name="$(basename "${spcd_ipm__url}")" - spcd_split - echo "\ -${spcd_ipm__url} -↓" - git clone \ - "${spcd_ipm__url}" \ - "${spcd_ipm__root}/${spcd_ipm__name}" || - exit - spcd_ipm__path="${spcd_ipm__root}/${spcd_ipm__name}/${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_ipm__root}/${spcd_ipm__name}/spcd.sh" - if [ -f "${spcd_ipm__script}" ]; then - spcd_split - spcd_ipm__check="${spcd_ipm__root}/check.sha512sum" - sha512sum "${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}" - sha512sum -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" - fi - done - spcd_split - spcd_ls "${spcd_ipm__target}" - spcd_split - spcd_rm "${spcd_ipm__root}" -} - spcd_write_python_module() { spcd_step "Write Python module" for spcd_wpm__variable in \ From c8d51c04d9fc448c56a7c15092b68986774f728e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 19:26:19 +0200 Subject: [PATCH 3/4] err on arch venv --- spcd.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index 6b73502..d75fbe2 100644 --- a/spcd.sh +++ b/spcd.sh @@ -746,7 +746,10 @@ spcd_install_packages() { "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") spcd_install_package "python3-venv" ;; - # FIXME arch + "${SPCD_OS_ARCH}") + # FIXME arch + exit 255 + ;; *) ;; esac spcd_split From ad31869ee1a4b94aa74e0d6671035f8115a69eb0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 19:28:36 +0200 Subject: [PATCH 4/4] move env to system packages --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index d75fbe2..b616caa 100644 --- a/spcd.sh +++ b/spcd.sh @@ -781,7 +781,7 @@ spcd_write_python_module() { spcd_wpm__text="${spcd_wpm__text}${spcd_wpm__value} " done - spcd_write "${SPCD_PYTHON_VENV_PACKAGES}/env.py" "${spcd_wpm__text} + spcd_write "${SPCD_PYTHON_PACKAGES}/env.py" "${spcd_wpm__text} SPCD_STEP = $((SPCD_STEP + 1)) " }