You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by je...@apache.org on 2013/09/27 16:26:14 UTC
[10/50] [abbrv] webworks commit: [CB-3798] Fixed CORDOVA_BBTOOLS env
variable with spaces in path
[CB-3798] Fixed CORDOVA_BBTOOLS env variable with spaces in path
Reviewed by Bryan Higgins <bh...@blackberry.com>
Tested by Tracy Li <tl...@blackberry.com>
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/2936ea0d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/2936ea0d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/2936ea0d
Branch: refs/heads/3.1.x
Commit: 2936ea0dcc9cf9bbee39d750b3807a3ca8d96e63
Parents: 19267e2
Author: jkeshavarzi <jk...@blackberry.com>
Authored: Fri Aug 2 17:39:09 2013 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue Aug 6 14:31:31 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/lib/utils.js | 4 ++++
.../bin/templates/project/cordova/lib/debugtoken-helper.js | 4 ++--
.../bin/templates/project/cordova/lib/native-packager.js | 1 +
blackberry10/bin/templates/project/cordova/lib/run | 8 ++++----
.../bin/templates/project/cordova/lib/signing-helper.js | 3 ++-
.../bin/templates/project/cordova/lib/target-utils.js | 2 +-
6 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2936ea0d/blackberry10/bin/lib/utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/utils.js b/blackberry10/bin/lib/utils.js
index 8a05ddc..4f4a500 100644
--- a/blackberry10/bin/lib/utils.js
+++ b/blackberry10/bin/lib/utils.js
@@ -166,6 +166,10 @@ _self = {
}
},
+ inQuotes : function (property) {
+ return "\"" + property + "\"";
+ },
+
loadModule: function (path) {
return require(path);
},
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2936ea0d/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
index bbdb048..206bd58 100755
--- a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
@@ -100,7 +100,7 @@ function generateDeployTokenOptions(target) {
function execNativeScript(script, options, callback) {
var cp;
- script = path.join(process.env.CORDOVA_BBTOOLS, script);
+ script = utils.inQuotes(path.join(process.env.CORDOVA_BBTOOLS, script));
if (pkgrUtils.isWindows()) {
script += ".bat";
@@ -244,7 +244,7 @@ self.deployToken = function (projectProperties, target, callback) {
};
self.checkDebugToken = function (pin, callback) {
- var script = path.join(process.env.CORDOVA_BBTOOLS, "blackberry-nativepackager"),
+ var script = utils.inQuotes(path.join(process.env.CORDOVA_BBTOOLS, "blackberry-nativepackager")),
nativePackager;
if (!callback || typeof callback !== "function") {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2936ea0d/blackberry10/bin/templates/project/cordova/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/native-packager.js b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
index e4aa81b..98346b4 100644
--- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
@@ -18,6 +18,7 @@ var childProcess = require("child_process"),
fs = require("fs"),
path = require("path"),
util = require("util"),
+ utils = require("./utils"),
data2xml = require("../third_party/data2xml/data2xml"),
wrench = require("wrench"),
conf = require("./conf"),
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2936ea0d/blackberry10/bin/templates/project/cordova/lib/run
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/run b/blackberry10/bin/templates/project/cordova/lib/run
index 8429db2..e47e6c6 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -72,7 +72,7 @@ function generateOptions(uninstall) {
}
function execNativeDeploy(optionsArray, callback) {
- var script = path.join(process.env.CORDOVA_BBTOOLS, "blackberry-deploy"),
+ var script = utils.inQuotes(path.join(process.env.CORDOVA_BBTOOLS, "blackberry-deploy")),
nativeDeploy;
options = optionsArray.join(" ");
@@ -105,13 +105,13 @@ function setTarget(callback) {
callback();
} else {
console.error("No connected device found");
- console.error("Devices must first be configured using platforms/blackberry/cordova/target");
+ console.error("Devices must first be configured using platforms/blackberry/cordova/target");
process.exit(1);
}
});
} else if (program["emulator"]) {
targetUtils.getTargetList("simulator", true, function (targets) {
- if (targets && targets.length > 0) {
+ if (targets && targets.length > 0) {
target = targets[0].name;
callback();
} else {
@@ -150,7 +150,7 @@ function checkTarget() {
}
function uninstall() {
- var script = path.join(process.env.CORDOVA_BBTOOLS, "blackberry-deploy"),
+ var script = utils.inQuotes(path.join(process.env.CORDOVA_BBTOOLS, "blackberry-deploy")),
nativeDeploy;
if (pkgrUtils.isWindows()) {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2936ea0d/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
index c4074af..73b17df 100644
--- a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
@@ -18,6 +18,7 @@ var path = require('path'),
os = require('os'),
childProcess = require("child_process"),
util = require("util"),
+ utils = require("./utils"),
conf = require("./conf"),
pkgrUtils = require("./packager-utils"),
logger = require("./logger"),
@@ -61,7 +62,7 @@ function getDefaultPath(file) {
}
function execSigner(session, target, callback) {
- var script = path.join(process.env.CORDOVA_BBTOOLS, "blackberry-signer"),
+ var script = utils.inQuotes(path.join(process.env.CORDOVA_BBTOOLS, "blackberry-signer")),
signer,
params = session.getParams("blackberry-signer"),
args = [];
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2936ea0d/blackberry10/bin/templates/project/cordova/lib/target-utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/target-utils.js b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
index b82f958..f74b4f2 100644
--- a/blackberry10/bin/templates/project/cordova/lib/target-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/target-utils.js
@@ -62,7 +62,7 @@ _self = {
},
checkConnection: function(ip, type, callback) {
- var script = path.join(process.env.CORDOVA_BBTOOLS, 'blackberry-deploy');
+ var script = bb10_utils.inQuotes(path.join(process.env.CORDOVA_BBTOOLS, 'blackberry-deploy'));
exec(script + ' -test ' + ip, function(error, stdout, stderr) {
// error code 3 corresponds to a connected device, null corresponds to connected sim