Merge #1572: Upgrade setuptools also with --docker-install

7181512 Upgrade setuptools also with --docker-install (Kristaps Kaupe)

Pull request description:

  This was missed in #1484.

ACKs for top commit:
  roshii:
    tACK 7181512

Tree-SHA512: 4e7d3fb139558d24992bf78b22b8a191fdbf99de14abc34adfd370b7bd2d3ff8b1ceaf1c6c2ccf1b000107e83c87420e73b4fc1cb1453883502f1e83f137737f

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