From 71815129e3c47051aaaee89ab06876e1079af00c Mon Sep 17 00:00:00 2001
From: Kristaps Kaupe <kristaps@blogiem.lv>
Date: Sat, 7 Oct 2023 14:46:12 +0300
Subject: [PATCH] Upgrade setuptools also with --docker-install

---
 install.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 16afd2c..da68976 100755
--- a/install.sh
+++ b/install.sh
@@ -176,6 +176,12 @@ check_skip_build ()
     return 1
 }
 
+upgrade_setuptools ()
+{
+    pip install --upgrade pip
+    pip install --upgrade setuptools
+}
+
 venv_setup ()
 {
     if check_skip_build 'jmvenv'; then
@@ -186,8 +192,7 @@ venv_setup ()
     "${python}" -m venv "${jm_source}/jmvenv" || return 1
     # shellcheck source=/dev/null
     source "${jm_source}/jmvenv/bin/activate" || return 1
-    pip install --upgrade pip
-    pip install --upgrade setuptools
+    upgrade_setuptools
     deactivate
 }
 
@@ -621,6 +626,8 @@ main ()
         fi
         # shellcheck source=/dev/null
         source "${jm_root}/bin/activate"
+    else
+        upgrade_setuptools
     fi
     if [[ ${build_local_tor} == "1" ]]; then
         if ! tor_deps_install; then