Skip to content

Commit 57de2d5

Browse files
committed
fix: use the returned binDir from extractFunction
1 parent d5d332b commit 57de2d5

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/utils/setup/setupBin.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ export async function setupBin(
8282
}
8383
}
8484

85-
const installDir = join(setupDir, extractedFolderName)
86-
const binDir = join(installDir, binRelativeDir)
85+
let installDir = join(setupDir, extractedFolderName)
86+
let binDir = join(installDir, binRelativeDir)
8787
const binFile = join(binDir, binFileName)
8888

8989
// download ane extract the package into the installation directory.
@@ -113,7 +113,11 @@ export async function setupBin(
113113

114114
try {
115115
const downloaded = await downloadTool(url)
116-
await extractFunction?.(downloaded, setupDir)
116+
const extractedBinDir = await extractFunction?.(downloaded, setupDir)
117+
if (typeof extractedBinDir === "string") {
118+
binDir = extractedBinDir
119+
installDir = extractedBinDir
120+
}
117121
} catch (err) {
118122
throw new Error(`Failed to download ${name} ${version} ${arch} from ${url}: ${err}`)
119123
}

0 commit comments

Comments
 (0)