@@ -94,8 +94,14 @@ function getProxyConfig(hostname) {
94
94
process . env . no_PROXY ||
95
95
process . env . no_proxy ;
96
96
97
- if ( noProxy && noProxy !== '*' ) {
97
+ if ( noProxy === '*' ) {
98
+ packageUtil . trace ( 'noProxy wildcard' ) ;
99
+ proxyConfig . useProxy = false ;
100
+ proxyConfig . hostname = undefined ;
101
+ proxyConfig . hostname = undefined ;
102
+ } else if ( noProxy ) {
98
103
const noProxies = noProxy . toLowerCase ( ) . split ( ',' ) ;
104
+ packageUtil . trace ( 'noProxy' , noProxies ) ;
99
105
100
106
if ( noProxies . indexOf ( hostname . toLowerCase ( ) ) > - 1 ) {
101
107
proxyConfig . useProxy = false ;
@@ -112,7 +118,7 @@ function getProxyConfig(hostname) {
112
118
function verifyBinary ( ) {
113
119
return new Promise ( ( resolve , reject ) => {
114
120
packageUtil . trace ( 'In verifyBinary' ) ;
115
- packageUtil . trace ( 'Checking for binary at ' , packageUtil . BINARY_PATH_LOCAL ) ;
121
+ packageUtil . trace ( 'Checking for binary at' , packageUtil . BINARY_PATH_LOCAL ) ;
116
122
packageUtil . log ( 'Verifying installation' ) ;
117
123
118
124
if ( ! fs . existsSync ( packageUtil . BINARY_PATH_LOCAL ) ) {
@@ -226,7 +232,7 @@ function getFileReadStreamByProxy(hostname, path, proxyHostname, proxyPort) {
226
232
// file read stream.
227
233
function getFileReadStreamBase ( hostname , path , socket , agent ) {
228
234
return new Promise ( ( resolve , reject ) => {
229
- packageUtil . trace ( 'In getFileReadStreamBase' , hostname , path , socket , agent ) ;
235
+ packageUtil . trace ( 'In getFileReadStreamBase' , hostname , path ) ;
230
236
231
237
let settled = false ;
232
238
@@ -417,7 +423,7 @@ function install() {
417
423
418
424
packageUtil . log ( 'Beginning installation' ) ;
419
425
420
- verifyBinary ( )
426
+ verifyBinary ( ) // check if download is necessary for 'npm rebuild'
421
427
. then ( ( valid ) => {
422
428
if ( valid ) {
423
429
done ( null , true ) ;
0 commit comments