You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/06/05 21:18:03 UTC

git commit: npm version 2.8.6. [CB-3614] Fix in bootstrap / post-install script for detecting when bootstrap is complete. Giant sudo notification warning should now show up.

Updated Branches:
  refs/heads/master2 9d62a8123 -> a817a29dd


npm version 2.8.6. [CB-3614] Fix in bootstrap / post-install script for detecting when bootstrap is complete. Giant sudo notification warning should now show up.


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/a817a29d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/a817a29d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/a817a29d

Branch: refs/heads/master2
Commit: a817a29dde7d3d881a317c9c05ee382969da5d6e
Parents: 9d62a81
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Jun 5 12:17:56 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Wed Jun 5 12:17:56 2013 -0700

----------------------------------------------------------------------
 bootstrap.js |    5 +++--
 package.json |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/a817a29d/bootstrap.js
----------------------------------------------------------------------
diff --git a/bootstrap.js b/bootstrap.js
index aeefa2b..41dc854 100644
--- a/bootstrap.js
+++ b/bootstrap.js
@@ -42,7 +42,7 @@ var platformsDir = path.join(cordovaDir, 'platforms');
 // kill the stupid spec shit!
 shell.rm('-rf', path.join(cordovaDir, 'www', 'spec'));
 
-var end = n(platforms.length, function() {
+var end = n(Object.keys(platforms).length, function() {
     // Check that we are installing globally into a root-only directory.
     if (process.env.USER == 'root') {
         console.log("**************************************************************************");
@@ -61,6 +61,7 @@ Object.keys(platforms).forEach(function(platform) {
             console.error('WARNING: Your system does not meet requirements to create ' + platform + ' projects. See error output below.');
             console.error(err);
             console.error('SKIPPING ' + platform + ' bootstrap.');
+            end();
         } else {
             console.log('SUCCESS: Minimum requirements for ' + platform + ' met.');
             var fix_path = path.join(tempDir, platform + '_fixture');
@@ -93,8 +94,8 @@ Object.keys(platforms).forEach(function(platform) {
                         shell.chmod('+x', other_script_path);
                     });
                     console.log('SUCCESS: ' + platform + ' ready to rock!');
-                    end();
                 }
+                end();
             });
         }
     });

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/a817a29d/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index f3d386c..38ac8a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "preferGlobal": "true",
   "description": "Cordova command line interface tool",
   "main": "cordova",