hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli/windows): robust unzip in runtime bootstrap (powershell full-path, pwsh, tar fallback; extract to user cache)

Browse Source
This commit is contained in:
James Peter
2025-09-11 22:35:17 +10:00
parent 99a328ec81
commit 1a31d2e1a1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-cli/bin/coder.js
+13 -7
View File
@@ -225,9 +225,17 @@ const tryBootstrapBinary = async () => {
return httpsDownload(url, tmp)
.then(() => {
if (isWin) {
// Extract zip with robust fallbacks and use a safe temp dir, then move to cache
try {
const ps = `powershell -NoProfile -NonInteractive -Command "Expand-Archive -Path '${tmp}' -DestinationPath '${binDir}' -Force"`;
execSync(ps, { stdio: "ignore" });
const sysRoot = process.env.SystemRoot || process.env.windir || 'C:\\\Windows';
const psFull = path.join(sysRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe');
const unzipDest = getCacheDir(version); // extract directly to cache location
const psCmd = `Expand-Archive -Path '${tmp}' -DestinationPath '${unzipDest}' -Force`;
let ok = false;
try { execSync(`"${psFull}" -NoProfile -NonInteractive -Command "${psCmd}"`, { stdio: 'ignore' }); ok = true; } catch {}
if (!ok) { try { execSync(`powershell -NoProfile -NonInteractive -Command "${psCmd}"`, { stdio: 'ignore' }); ok = true; } catch {} }
if (!ok) { try { execSync(`pwsh -NoProfile -NonInteractive -Command "${psCmd}"`, { stdio: 'ignore' }); ok = true; } catch {} }
if (!ok) { execSync(`tar -xf "${tmp}" -C "${unzipDest}"`, { stdio: 'ignore', shell: true }); }
} catch (e) {
throw new Error(`failed to unzip: ${e.message}`);
} finally { try { unlinkSync(tmp); } catch {} }
@@ -242,12 +250,10 @@ const tryBootstrapBinary = async () => {
try { unlinkSync(tmp); } catch {}
}
}
// On Windows, prefer cache and avoid leaving the executable in node_modules
// On Windows, the file was extracted directly into the cache dir
if (platform === "win32") {
try {
copyFileSync(binaryPath, cachePath);
} catch {}
try { unlinkSync(binaryPath); } catch {}
// Ensure the expected filename exists in cache; Expand-Archive extracts exact name
// No action required here; validation occurs below against cachePath
} else {
try { copyFileSync(binaryPath, cachePath); } catch {}
}