Cleanup installLinks

Author: jdalton

src/shadow/npm/bin.mts

@@ -80,6 +80,8 @@ export default async function shadowBin(
     stdio = ['pipe', 'pipe', 'pipe', 'ipc']
   }
 
+  const realBinPath = await installLinks(constants.shadowBinPath, binName)
+
   const spawnPromise = spawn(
     constants.execPath,
     [
@@ -92,7 +94,7 @@ export default async function shadowBin(
         : []),
       '--require',
       constants.shadowNpmInjectPath,
-      await installLinks(constants.shadowBinPath, binName),
+      realBinPath,
       ...(useNodeOptions
         ? [
             `--node-options='${nodeOptionsArg ? nodeOptionsArg.slice(15) : ''}${cmdFlagsToString(permArgs)}'`,

src/shadow/npm/link.mts

@@ -11,7 +11,7 @@ import {
 } from '../../utils/npm-paths.mts'
 
 export async function installLinks(
-  realBinPath: string,
+  shadowBinPath: string,
   binName: 'npm' | 'npx',
 ): Promise<string> {
   const isNpx = binName === 'npx'
@@ -28,11 +28,11 @@ export async function installLinks(
     if (WIN32) {
       await cmdShim(
         path.join(constants.distPath, `${binName}-cli.js`),
-        path.join(realBinPath, binName),
+        path.join(shadowBinPath, binName),
       )
     }
     const { env } = process
-    env['PATH'] = `${realBinPath}${path.delimiter}${env['PATH']}`
+    env['PATH'] = `${shadowBinPath}${path.delimiter}${env['PATH']}`
   }
   return binPath
 }