Merge pull request #501 from m-1-k-3/install_ubuntu

Another PIPv23 fix
e-m-b-a · Feb 28, 2023 · dd4a713 · dd4a713
2 parents dd6ff48 + 79274f5
commit dd4a713
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/installer/helpers.sh b/installer/helpers.sh
@@ -162,14 +162,18 @@ print_pip_info() {
 
 pip_install() {
   local PIP_NAME="${1:-}"
+  local PIP_PARAMS=("$PIP_NAME")
   local PIP_OPTS="${2:-}"
+  if [[ -n "$PIP_OPTS" ]]; then
+    local PIP_PARAMS+=("$PIP_OPTS")
+  fi
+
   local PIP_VERS=""
   PIP_VERS=$(pip3 -V | awk '{print $2}')
-  if [[ "$(version "$PIP_VERS")" -lt "$(version "23")" ]]; then
-    pip3 install "$PIP_NAME" "$PIP_OPTS"
-  else
-    pip3 install "$PIP_NAME" --break-system-packages "$PIP_OPTS"
+  if [[ "$(version "$PIP_VERS")" -ge "$(version "23")" ]]; then
+    PIP_PARAMS+=(--break-system-packages)
   fi
+  pip3 install "${PIP_PARAMS[@]}"
 }
 
 # print_file_info a b c d e