Fix for cli with new node scripts

bin/create

@@ -18,15 +18,36 @@
        specific language governing permissions and limitations
        under the License.
 */
-
-var create = require('./lib/create');
+var path   = require('path');
 var args  = process.argv;
 
-// Support basic help commands
-if(args.length < 3 || (args[2] == '--help' || args[2] == '/?' || args[2] == '-h' ||
-                    args[2] == 'help' || args[2] == '-help' || args[2] == '/help')) {
-    create.help();
-} else {
-    create.run(args[2], args[3], args[4]);
-    process.exit(0);
+try {
+    require.resolve("shelljs");
+    create();
+} catch(e) {
+    console.log('Shelljs module was not found, running \'npm install\'.....');
+    var exec = require('child_process').exec;
+    var cwd = process.cwd();
+    process.chdir(__dirname);
+    exec('npm install',  function (error, stdout, stderr) {
+        if (error !== null) {
+          console.error('ERROR : running \'npm install\' is npm installed? ' + error);
+          console.error(stderr);
+          process.exit(error.code);
+        }
+        process.chdir(cwd);
+        create();
+    });
+}
+
+function create() {
+  var create = require('./lib/create');
+  // Support basic help commands
+  if(args.length < 3 || (args[2] == '--help' || args[2] == '/?' || args[2] == '-h' ||
+                      args[2] == 'help' || args[2] == '-help' || args[2] == '/help')) {
+      create.help();
+  } else {
+      create.run(args[2], args[3], args[4]);
+      process.exit(0);
+  }
 }

bin/lib/create.js

@@ -18,13 +18,6 @@
        specific language governing permissions and limitations
        under the License.
 */
-try {
-    require.resolve("shelljs");
-} catch(e) {
-    console.error('Shelljs module was not found, please run \'npm install\' from the bin folder.');
-    process.exit(e.code);
-}
-
 var shell = require('shelljs'),
     path  = require('path'),
     fs    = require('fs'),

bin/templates/cordova/version

@@ -26,6 +26,8 @@ var args  = process.argv;
 if(args.length > 2) {
     version.help();
 } else {
-    console.log(version.run());
+    // TODO : Don't have this hardcoded into the scripts
+    console.log('3.1.0-dev');
+    //console.log(version.run());
     process.exit(0);
 }