cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhigg...@apache.org
Subject [1/3] webworks commit: CB-3380 Skip NPM check when dependencies are bundled
Date Mon, 13 Jan 2014 20:39:20 GMT
Updated Branches:
  refs/heads/master 86e654ca0 -> ead6edd7b


CB-3380 Skip NPM check when dependencies are bundled


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

Branch: refs/heads/master
Commit: 38a98c768a4b6a27f1f2aa56f8ccc160b3740c55
Parents: 86e654c
Author: Bryan Higgins <bhiggins@blackberry.com>
Authored: Fri Jan 10 15:24:17 2014 -0500
Committer: Bryan Higgins <bhiggins@blackberry.com>
Committed: Fri Jan 10 15:24:17 2014 -0500

----------------------------------------------------------------------
 blackberry10/bin/init     | 2 +-
 blackberry10/bin/init.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/38a98c76/blackberry10/bin/init
----------------------------------------------------------------------
diff --git a/blackberry10/bin/init b/blackberry10/bin/init
index 9eb06f4..4a6199b 100755
--- a/blackberry10/bin/init
+++ b/blackberry10/bin/init
@@ -63,7 +63,7 @@ if [ -z "$CORDOVA_NODE" ] && [ -z "$CORDOVA_BBTOOLS" ]; then
     if [ ! -x "$NODE" ]; then
         echo node cannot be found on the path. Aborting.
         EXIT_CODE=2
-    elif [ ! -x "$NPM" ]; then
+    elif [ ! -x "$LOCAL_NODE_BIN" && ! -x "$NPM" ]; then
         echo npm cannot be found on the path. Aborting.
         EXIT_CODE=2
     elif [ ! -x "$JAVA" ]; then

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/38a98c76/blackberry10/bin/init.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/init.bat b/blackberry10/bin/init.bat
index b6c8363..a67bbb7 100644
--- a/blackberry10/bin/init.bat
+++ b/blackberry10/bin/init.bat
@@ -83,7 +83,7 @@ if exist "%LOCAL_BBTOOLS_BINARY%" (
     )
 )
 
-if not exist "%CORDOVA_NODE%\node.exe" (
+if not exist "%LOCAL_NODE_BINARY%" && not exist "%CORDOVA_NODE%\node.exe" (
   echo node cannot be found on the path. Aborting.
   exit /b 2
 )


Mime
View raw message