Skip to content

Commit 2b4483e

Browse files
committed
Only download OpenSSL sha256 if necessary
1 parent 353eb2e commit 2b4483e

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

utils/acquireOpenSSL.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,11 @@ const buildOpenSSLIfNecessary = async ({
290290
console.log("Build finished.");
291291
}
292292

293-
const downloadOpenSSLIfNecessary = async (downloadBinUrl, maybeDownloadSha256) => {
293+
const downloadOpenSSLIfNecessary = async ({
294+
downloadBinUrl,
295+
maybeDownloadSha256,
296+
maybeDownloadSha256Url
297+
}) => {
294298
if (process.platform !== "darwin" && process.platform !== "win32" && process.platform !== "linux") {
295299
console.log(`Skipping OpenSSL download, not required on ${process.platform}`);
296300
return;
@@ -306,6 +310,10 @@ const downloadOpenSSLIfNecessary = async (downloadBinUrl, maybeDownloadSha256) =
306310
console.log("Skipping OpenSSL download, dir exists");
307311
return;
308312
} catch {}
313+
314+
if (maybeDownloadSha256Url) {
315+
maybeDownloadSha256 = (await got(maybeDownloadSha256Url)).body.trim();
316+
}
309317

310318
const downloadStream = got.stream(downloadBinUrl);
311319
downloadStream.on("downloadProgress", makeOnStreamDownloadProgress());
@@ -370,16 +378,16 @@ const acquireOpenSSL = async () => {
370378
try {
371379
const downloadBinUrl = process.env.npm_config_openssl_bin_url || getOpenSSLPackageUrl();
372380
if (downloadBinUrl !== 'skip' && !process.env.NODEGIT_OPENSSL_BUILD_PACKAGE) {
373-
let maybeDownloadSha256;
381+
const downloadOptions = { downloadBinUrl };
374382
if (process.env.npm_config_openssl_bin_sha256 !== 'skip') {
375383
if (process.env.npm_config_openssl_bin_sha256) {
376-
maybeDownloadSha256 = process.env.npm_config_openssl_bin_sha256;
384+
downloadOptions.maybeDownloadSha256 = process.env.npm_config_openssl_bin_sha256;
377385
} else {
378-
maybeDownloadSha256 = (await got(`${getOpenSSLPackageUrl()}.sha256`)).body.trim();
386+
downloadOptions.maybeDownloadSha256Url = `${getOpenSSLPackageUrl()}.sha256`;
379387
}
380388
}
381389

382-
await downloadOpenSSLIfNecessary(downloadBinUrl, maybeDownloadSha256);
390+
await downloadOpenSSLIfNecessary(downloadOptions);
383391
return;
384392
}
385393

0 commit comments

Comments
 (0)