fix: fix the pipx packages bin directory

aminya · Sep 19, 2024 · c9bc540 · c9bc540
1 parent 4d73853
commit c9bc540
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 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/utils/setup/setupPipPack.ts b/src/utils/setup/setupPipPack.ts
@@ -62,7 +62,9 @@ export async function setupPipPackWithPython(
       ? await pipxPackageInstalled(givenPython, nameOnly)
       : await pipPackageIsInstalled(givenPython, nameOnly)
     if (installed) {
-      const binDir = await finishPipPackageInstall(givenPython, nameOnly)
+      const binDir = isPipx
+        ? await finishPipxPackageInstall()
+        : await finishPipPackageInstall(givenPython, nameOnly)
       return { binDir }
     }
   }
@@ -99,10 +101,16 @@ export async function setupPipPackWithPython(
     throw new Error(`Failed to install ${name} as it was not found via ${pip} or the system package manager`)
   }
 
-  const binDir = await finishPipPackageInstall(givenPython, nameOnly)
+  const binDir = isPipx
+    ? await finishPipxPackageInstall()
+    : await finishPipPackageInstall(givenPython, nameOnly)
   return { binDir }
 }
 
+function finishPipxPackageInstall() {
+  return getPipxBinDir()
+}
+
 async function finishPipPackageInstall(givenPython: string, name: string) {
   const pythonBaseExecPrefix = await addPythonBaseExecPrefix(givenPython)
   const binDir = await findBinDir(pythonBaseExecPrefix, name)