node-install-release 0.3.18 → 0.4.2

package/lib/conditionalExtract.js

@@ -5,14 +5,7 @@ var access = require('fs-access-compat');
 
 var progress = require('./progress');
 
-var major = +process.versions.node.split('.')[0];
-var minor = +process.versions.node.split('.')[1];
-var callExtract = path.join(__dirname, 'callExtract.js');
-
-var call = null; // break dependencies
 module.exports = function conditionalExtract(src, dest, options, callback) {
-  if (!call) call = require('node-version-call'); // break dependencies
-
   if (typeof options === 'function') {
     callback = options;
     options = null;
@@ -25,22 +18,10 @@ module.exports = function conditionalExtract(src, dest, options, callback) {
     mkpath(path.dirname(dest), function () {
       var extractOptions = Object.assign({ strip: 1, progress: progress, time: 1000 }, options);
 
-      // TODO: yauzl does not read the master record properly on Node 0.8
-      if (major === 0 && minor <= 8 && path.extname(src) === '.zip') {
-        try {
-          delete extractOptions.progress;
-          call({ version: 'lts', callbacks: true }, callExtract, src, dest, extractOptions);
-          console.log('');
-          callback();
-        } catch (err) {
-          callback(err);
-        }
-      } else {
-        extract(src, dest, extractOptions, function (err) {
-          console.log('');
-          callback(err);
-        });
-      }
+      extract(src, dest, extractOptions, function (err) {
+        console.log('');
+        callback(err);
+      });
     });
   });
 };

package/lib/installNode/installCompressed.js

@@ -1,4 +1,6 @@
 var path = require('path');
+var access = require('fs-access-compat');
+var rimraf = require('rimraf');
 
 var conditionalCache = require('../conditionalCache');
 var conditionalExtract = require('../conditionalExtract');
@@ -10,9 +12,17 @@ module.exports = function installCompressed(relativePath, dest, record, options,
 
   conditionalCache(downloadPath, cachePath, function (err) {
     if (err) return callback(err);
-    conditionalExtract(cachePath, dest, Object.assign({ strip: 1, progress: progress, time: 1000 }, options), function (err) {
-      console.log('');
-      callback(err);
+    access(dest, function (err) {
+      if (!err) return callback(); // already exists
+      conditionalExtract(cachePath, dest, Object.assign({ strip: 1, progress: progress, time: 1000 }, options), function (err) {
+        console.log('');
+        if (err) return callback(err);
+
+        // some compressed versions of node come with npm pre-installed, but we want to override
+        rimraf(path.join(dest, 'node_modules'), function () {
+          callback(err);
+        });
+      });
     });
   });
 };

package/lib/installNode/installExe.js

@@ -1,8 +1,8 @@
 var path = require('path');
+var access = require('fs-access-compat');
 
 var conditionalCache = require('../conditionalCache');
 var copyFile = require('../copyFile');
-var access = require('fs-access-compat');
 
 module.exports = function installExe(relativePath, dest, record, options, callback) {
   var downloadPath = options.downloadURL(relativePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-install-release",
-  "version": "0.3.18",
+  "version": "0.4.2",
   "description": "Cross-platform solution for installing releases of Node.js",
   "keywords": [
     "node",
@@ -36,19 +36,18 @@
     "cross-spawn-cb": "^0.6.14",
     "end-with": "^1.0.2",
     "exit": "^0.1.2",
-    "fast-extract": "^0.3.4",
+    "fast-extract": "^0.4.3",
     "fs-access-compat": "^1.0.3",
     "function-exec-sync": "^0.2.10",
-    "get-remote": "^0.7.12",
+    "get-remote": "^0.8.1",
     "getopts-compat": "^2.2.5",
     "isarray": "^2.0.5",
     "lodash.find": "^4.6.0",
     "lodash.keys": "^4.2.0",
     "match-semver": "^0.1.1",
     "mkpath": "^1.0.0",
-    "node-filename-to-dist-paths": "^0.1.16",
-    "node-resolve-versions": "^0.3.7",
-    "node-version-call": "^0.3.19",
+    "node-filename-to-dist-paths": "^0.2.1",
+    "node-resolve-versions": "^0.3.9",
     "osenv": "^0.1.5",
     "pump": "^3.0.0",
     "queue-cb": "^1.1.7",

package/lib/callExtract.js

@@ -1,5 +0,0 @@
-var extract = require('fast-extract');
-
-module.exports = function callExtract(src, dest, options, callback) {
-  extract(src, dest, options, callback);
-};