You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2013/12/19 16:12:48 UTC
webworks commit: CB-5660 Revert CB-5443 due to issues with
parentheses in Windows PATH
Updated Branches:
refs/heads/3.3.x ac5f461fa -> 820b0c9eb
CB-5660 Revert CB-5443 due to issues with parentheses in Windows PATH
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/820b0c9e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/820b0c9e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/820b0c9e
Branch: refs/heads/3.3.x
Commit: 820b0c9eb0b9ce8c9ee4bf077461e8101b913182
Parents: ac5f461
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Thu Dec 19 08:56:20 2013 -0500
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Thu Dec 19 08:56:20 2013 -0500
----------------------------------------------------------------------
blackberry10/bin/init.bat | 30 ++++++++----------------------
1 file changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/820b0c9e/blackberry10/bin/init.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/init.bat b/blackberry10/bin/init.bat
index b6c8363..aad56c6 100644
--- a/blackberry10/bin/init.bat
+++ b/blackberry10/bin/init.bat
@@ -23,28 +23,6 @@ set CORDOVA_HOME_DIR=%USERPROFILE%\.cordova\lib\blackberry10\cordova\%CORDOVA_VE
set LOCAL_NODE_BINARY=%CORDOVA_HOME_DIR%\bin\dependencies\node\bin
set LOCAL_BBTOOLS_BINARY=%CORDOVA_HOME_DIR%\bin\dependencies\bb-tools\bin
-set FOUNDJAVA=
-for %%e in (%PATHEXT%) do (
- for %%X in (java%%e) do (
- if not defined FOUNDJAVA (
- set FOUNDJAVA=%%~$PATH:X
- )
- )
-)
-if not defined FOUNDJAVA (
- set JAVAPATH="%ProgramFiles(x86)%\java\jre7\bin;%ProgramW6432%\java\jre7\bin;"
- for %%e in (%PATHEXT%) do (
- for %%X in (java%%e) do (
- if not defined FOUNDJAVAAT (
- set FOUNDJAVAAT=%%~dp$JAVAPATH:X
- )
- )
- )
-)
-if defined FOUNDJAVAAT (
- set PATH=%PATH%;%FOUNDJAVAAT%
-)
-
if defined CORDOVA_NODE (
if exist "%CORDOVA_NODE%" (
if defined CORDOVA_BBTOOLS (
@@ -83,6 +61,14 @@ if exist "%LOCAL_BBTOOLS_BINARY%" (
)
)
+set FOUNDJAVA=
+for %%e in (%PATHEXT%) do (
+ for %%X in (java%%e) do (
+ if not defined FOUNDJAVA (
+ set FOUNDJAVA=%%~$PATH:X
+ )
+ )
+)
if not exist "%CORDOVA_NODE%\node.exe" (
echo node cannot be found on the path. Aborting.
exit /b 2