@@ -290,7 +290,11 @@ const buildOpenSSLIfNecessary = async ({
290
290
console . log ( "Build finished." ) ;
291
291
}
292
292
293
- const downloadOpenSSLIfNecessary = async ( downloadBinUrl , maybeDownloadSha256 ) => {
293
+ const downloadOpenSSLIfNecessary = async ( {
294
+ downloadBinUrl,
295
+ maybeDownloadSha256,
296
+ maybeDownloadSha256Url
297
+ } ) => {
294
298
if ( process . platform !== "darwin" && process . platform !== "win32" && process . platform !== "linux" ) {
295
299
console . log ( `Skipping OpenSSL download, not required on ${ process . platform } ` ) ;
296
300
return ;
@@ -306,6 +310,10 @@ const downloadOpenSSLIfNecessary = async (downloadBinUrl, maybeDownloadSha256) =
306
310
console . log ( "Skipping OpenSSL download, dir exists" ) ;
307
311
return ;
308
312
} catch { }
313
+
314
+ if ( maybeDownloadSha256Url ) {
315
+ maybeDownloadSha256 = ( await got ( maybeDownloadSha256Url ) ) . body . trim ( ) ;
316
+ }
309
317
310
318
const downloadStream = got . stream ( downloadBinUrl ) ;
311
319
downloadStream . on ( "downloadProgress" , makeOnStreamDownloadProgress ( ) ) ;
@@ -370,16 +378,16 @@ const acquireOpenSSL = async () => {
370
378
try {
371
379
const downloadBinUrl = process . env . npm_config_openssl_bin_url || getOpenSSLPackageUrl ( ) ;
372
380
if ( downloadBinUrl !== 'skip' && ! process . env . NODEGIT_OPENSSL_BUILD_PACKAGE ) {
373
- let maybeDownloadSha256 ;
381
+ const downloadOptions = { downloadBinUrl } ;
374
382
if ( process . env . npm_config_openssl_bin_sha256 !== 'skip' ) {
375
383
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 ;
377
385
} else {
378
- maybeDownloadSha256 = ( await got ( `${ getOpenSSLPackageUrl ( ) } .sha256` ) ) . body . trim ( ) ;
386
+ downloadOptions . maybeDownloadSha256Url = `${ getOpenSSLPackageUrl ( ) } .sha256` ;
379
387
}
380
388
}
381
389
382
- await downloadOpenSSLIfNecessary ( downloadBinUrl , maybeDownloadSha256 ) ;
390
+ await downloadOpenSSLIfNecessary ( downloadOptions ) ;
383
391
return ;
384
392
}
385
393
0 commit comments