fix: install pipx via pip too

aminya · Jan 12, 2025 · 0528a87 · 0528a87
1 parent 627f57a
commit 0528a87
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.mjs b/dist/modern/setup-cpp.mjs
diff --git a/dist/modern/setup-cpp.mjs.map b/dist/modern/setup-cpp.mjs.map
diff --git a/src/python/python.ts b/src/python/python.ts
@@ -61,22 +61,22 @@ async function setupPipx(foundPython: string) {
     if (!(await hasPipxModule(foundPython))) {
       try {
         // first try with the system-wide pipx
-        if ((await setupPipPackSystem("pipx", isArch())) === null) {
-          // try with pip
-          await setupPipPackWithPython(foundPython, "pipx", undefined, { upgrade: true, usePipx: false })
-        }
+        await setupPipPackSystem("pipx", isArch())
+        // then install with the system-wide pipx
+        await setupPipPackWithPython(foundPython, "pipx", undefined, { upgrade: true, usePipx: false })
       } catch (err) {
-        throw new Error(`pipx was not installed correctly ${err}`)
+        throw new Error(`pipx was not installed completely: ${err}`)
       }
     }
     if (await hasPipxModule(foundPython)) {
       await execa(foundPython, ["-m", "pipx", "ensurepath"], { stdio: "inherit" })
       return
     } else if (await hasPipxBinary()) {
+      notice("pipx module not found. Trying to install with pipx binary...")
       await execa("pipx", ["ensurepath"], { stdio: "inherit" })
       return
     } else {
-      notice("pipx module or pipx binary not found. Corrput pipx installation.")
+      throw new Error("pipx module or pipx binary not found. Corrput pipx installation.")
     }
   } catch (err) {
     notice(`Failed to install pipx: ${(err as Error).toString()}. Ignoring...`)