Merge pull request #2334 from NativeScript/vladimirov/fix-node-4

Fix CLI usage with Node.js 4

Author: rosen-vladimirov

bin/nativescript

@@ -1,19 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env node
 
-AB_DIR="`dirname \"$0\"`"
-NODE_VERSION=`node --version`
-NODE4_VERSION_PREFIX="v4."
-NODE5_VERSION_PREFIX="v5."
-
-# check if Node.js version is 4.x.x or 5.x.x - both of them do not support some of required features
-# so we have to pass --harmony flag for them in order to enable spread opearator usage
-# Use POSIX substring parameter expansion, so the code will work on all shells.
-
-if [ "${NODE_VERSION#$NODE4_VERSION_PREFIX*}" != "$NODE_VERSION" -o "${NODE_VERSION#$NODE5_VERSION_PREFIX*}" != "$NODE_VERSION" ]
-then
-	# Node is 4.x.x or 5.x.x
-	node --harmony "$AB_DIR/nativescript.js" "$@"
-else
-	# Node is NOT 4.x.x or 5.x.x
-	node "$AB_DIR/nativescript.js" "$@"
-fi
+require("./tns");

bin/nativescript.cmd

@@ -1,19 +1,36 @@
-#!/bin/sh
-
-AB_DIR="`dirname \"$0\"`"
-NODE_VERSION=`node --version`
-NODE4_VERSION_PREFIX="v4."
-NODE5_VERSION_PREFIX="v5."
-
-# check if Node.js version is 4.x.x or 5.x.x - both of them do not support some of required features
-# so we have to pass --harmony flag for them in order to enable spread opearator usage
-# Use POSIX substring parameter expansion, so the code will work on all shells.
-
-if [ "${NODE_VERSION#$NODE4_VERSION_PREFIX*}" != "$NODE_VERSION" -o "${NODE_VERSION#$NODE5_VERSION_PREFIX*}" != "$NODE_VERSION" ]
-then
-	# Node is 4.x.x or 5.x.x
-	node --harmony "$AB_DIR/nativescript.js" "$@"
-else
-	# Node is NOT 4.x.x or 5.x.x
-	node "$AB_DIR/nativescript.js" "$@"
-fi
+#!/usr/bin/env node
+
+"use strict";
+var path = require("path"),
+	node = require("../package.json").engines.node,
+	pathToLib = path.join(__dirname, "..", "lib"),
+	pathToCommon = path.join(pathToLib, "common");
+
+require(path.join(pathToCommon, "verify-node-version")).verifyNodeVersion(node, "NativeScript");
+
+var pathToCliExecutable = path.join(pathToLib, "nativescript-cli.js");
+
+var nodeArgs = require(path.join(pathToCommon, "scripts", "node-args")).getNodeArgs();
+
+if (nodeArgs.length) {
+	// We need custom args for Node process, so pass them here.
+	var childProcess = require("child_process");
+	var args = process.argv;
+
+	// Remove `node` and `nativescript` from the arguments.
+	args.shift();
+	args.shift();
+
+	args.unshift(pathToCliExecutable);
+
+	args = nodeArgs.concat(args);
+
+	var nodeProcess = childProcess.spawn(process.execPath, args, { stdio: "inherit" });
+
+	nodeProcess.on("close", function(code) {
+		// We need this handler so if command fails, we'll exit with same exit code as CLI.
+		process.exit(code);
+	});
+} else {
+	require(pathToCliExecutable);
+}

bin/nativescript.js

@@ -5,8 +5,8 @@
   "author": "Telerik <[email protected]>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
-    "tns": "./bin/nativescript.js",
-    "nativescript": "./bin/nativescript.js"
+    "tns": "./bin/tns",
+    "nativescript": "./bin/tns"
   },
   "main": "./lib/nativescript-cli.js",
   "scripts": {