fix: install pipx using apt without a prefix on Linux

aminya · Feb 14, 2024 · 5eefa3d · 5eefa3d
1 parent 4e8c2f8
commit 5eefa3d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/dist/actions/setup-cpp.js b/dist/actions/setup-cpp.js
diff --git a/dist/actions/setup-cpp.js.map b/dist/actions/setup-cpp.js.map
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.js b/dist/modern/setup-cpp.js
diff --git a/dist/modern/setup-cpp.js.map b/dist/modern/setup-cpp.js.map
diff --git a/src/python/python.ts b/src/python/python.ts
@@ -44,7 +44,13 @@ export async function setupPython(version: string, setupDir: string, arch: strin
 async function setupPipx(foundPython: string) {
   try {
     if (!(await hasPipx(foundPython))) {
-      await setupPipPackWithPython(foundPython, "pipx", undefined, { upgrade: true, usePipx: false })
+      try {
+        await setupPipPackWithPython(foundPython, "pipx", undefined, { upgrade: true, usePipx: false })
+      } catch (err) {
+        if (setupPipPackSystem("pipx", false) === null) {
+          throw new Error(`pipx was not installed correctly ${err}`)
+        }
+      }
     }
     await execa(foundPython, ["-m", "pipx", "ensurepath"], { stdio: "inherit" })
     await setupPipPackWithPython(foundPython, "venv", undefined, { upgrade: false, usePipx: false })

diff --git a/src/utils/setup/setupPipPack.ts b/src/utils/setup/setupPipPack.ts
@@ -174,15 +174,15 @@ async function findBinDir(dirs: string[], name: string) {
   return dirs[dirs.length - 1]
 }
 
-export function setupPipPackSystem(name: string) {
+export function setupPipPackSystem(name: string, addPythonPrefix = true) {
   if (process.platform === "linux") {
     info(`Installing ${name} via the system package manager`)
     if (isArch()) {
-      return setupPacmanPack(`python-${name}`)
+      return setupPacmanPack(addPythonPrefix ? `python-${name}` : name)
     } else if (hasDnf()) {
-      return setupDnfPack([{ name: `python3-${name}` }])
+      return setupDnfPack([{ name: addPythonPrefix ? `python3-${name}` : name }])
     } else if (isUbuntu()) {
-      return setupAptPack([{ name: `python3-${name}` }])
+      return setupAptPack([{ name: addPythonPrefix ? `python3-${name}` : name }])
     }
   }
   return null