You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/01/17 19:44:53 UTC
git commit: CB-5813 Fix missing quotes on update and ls commands
Updated Branches:
refs/heads/master 40089a1e2 -> e9615884c
CB-5813 Fix missing quotes on update and ls commands
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/e9615884
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/e9615884
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/e9615884
Branch: refs/heads/master
Commit: e9615884cfc414bdf5714098228a7a76d6b16453
Parents: 40089a1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 17 13:43:15 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jan 17 13:44:43 2014 -0500
----------------------------------------------------------------------
spec/platform.spec.js | 2 +-
src/platform.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/e9615884/spec/platform.spec.js
----------------------------------------------------------------------
diff --git a/spec/platform.spec.js b/spec/platform.spec.js
index 1958b9c..2f4fa19 100644
--- a/spec/platform.spec.js
+++ b/spec/platform.spec.js
@@ -290,7 +290,7 @@ describe('platform command', function() {
var oldVersion = lazyLoadVersion;
lazyLoadVersion = '1.0.0';
cordova.raw.platform('update', ['ios']).then(function() {
- expect(exec).toHaveBeenCalledWith('lib/ios/cordova/1.0.0/bin/update "some/path/platforms/ios"', jasmine.any(Function));
+ expect(exec).toHaveBeenCalledWith('"lib/ios/cordova/1.0.0/bin/update" "some/path/platforms/ios"', jasmine.any(Function));
}, fail).fin(function() {
lazyLoadVersion = oldVersion;
done();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/e9615884/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index b6a9613..1b7f179 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -132,7 +132,7 @@ module.exports = function platform(command, targets) {
// Call the platform's update script.
var script = path.join(libDir, 'bin', 'update');
var d = Q.defer();
- var cmd = script + ' "' + platformPath + '"';
+ var cmd = '"' + script + '" "' + platformPath + '"';
events.emit('verbose', 'Running command:' + cmd);
child_process.exec(cmd, function(err, stdout, stderr) {
if (err) {
@@ -158,7 +158,7 @@ module.exports = function platform(command, targets) {
return Q.all(platforms_on_fs.map(function(p) {
var script = path.join(projectRoot, 'platforms', p, 'cordova', 'version');
var d = Q.defer();
- child_process.exec(script, function(err, stdout, stderr) {
+ child_process.exec('"' + script + '"', function(err, stdout, stderr) {
if (err) d.resolve(p);
else {
if (stdout) d.resolve(p + ' ' + stdout.trim());