From 0d6cf1917c6978d0774d5dc7bae6798afafeb2c2 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 7 Aug 2024 19:12:14 +0200
Subject: [PATCH] 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 \