npmjx naming cleanup

martinies · Mar 31, 2015 · 87791c0 · 87791c0
1 parent c89a98a
commit 87791c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/node.js b/src/node.js
@@ -2162,7 +2162,8 @@
       req.end();
     };
     var name = "";
-    var npm_str = "https://s3.amazonaws.com/nodejx/npmjxv5.jx";
+    var npm_basename = "npmjxv6.jx";
+    var npm_str = "https://s3.amazonaws.com/nodejx/" + npm_basename;
     var isWindows = process.platform === 'win32';
     var homeFolder = process.__npmjxpath || process.env.HOME
       || process.env.HOMEPATH || process.env.USERPROFILE;
@@ -2262,7 +2263,7 @@
         fs.writeFileSync(jxFolder + pathModule.sep + process.jxversion, "1");
       }
 
-      targetBin = jxFolder + pathModule.sep + "npmjxv5.jx";
+      targetBin = jxFolder + pathModule.sep + npm_basename;
       download(npm_str, targetBin, function () {
         GoEn();
       });

diff --git a/tools/npmjx/index.js b/tools/npmjx/index.js
@@ -5,12 +5,6 @@ var http = require('https')
   , path = require('path')
   , fs = require("fs");
 
-if (process.argv[1].toLowerCase().lastIndexOf('npmjxv3.jx') != process.argv[1].length - 10) {
-  console.error("usage: jx install [package_name]");
-  console.error(">>", process.argv.join(" "));
-  process.exit(1);
-}
-
 var getOptions = function (name) {
   for (var o = 0; o < process.argv.length; o++) {
     if (process.argv[o] == name) {
@@ -139,9 +133,10 @@ var extract = function (loc, target, cb, targz) {
     else {
       var clear = false;
       try {
-        if (fs.existsSync(__dirname + path.sep + "npmjxv3.jx")) {
+        var fname = path.join(__dirname, path.basename(process.argv[1]));
+        if (fs.existsSync(fname)) {
           clear = true;
-          fs.unlink(__dirname + path.sep + "npmjxv3.jx");
+          fs.unlink(fname);
         }
       } catch (e) {
       }

diff --git a/tools/npmjx/npmjx.jxp b/tools/npmjx/npmjx.jxp
@@ -9,7 +9,7 @@
     "startup": "index.js",
     "execute": "index.js",
     "extract": false,
-    "output": "npmjxv5.jx",
+    "output": "npmjxv6.jx",
 	"files": [
 		"index.js",
 		"node_modules/tar.gz/example/example.js",