cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bra...@apache.org
Subject android commit: [CB-4996] Fix paths with spaces while launching on emulator and device
Date Wed, 06 Nov 2013 15:38:41 GMT
Updated Branches:
  refs/heads/master 4e1156e08 -> 8783cf03b


[CB-4996] Fix paths with spaces while launching on emulator and device


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

Branch: refs/heads/master
Commit: 8783cf03b279773bf71ae08f325b1a1f84dbf467
Parents: 4e1156e
Author: Braden Shepherdson <braden.shepherdson@gmail.com>
Authored: Wed Nov 6 10:37:59 2013 -0500
Committer: Braden Shepherdson <braden.shepherdson@gmail.com>
Committed: Wed Nov 6 10:37:59 2013 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/device.js   | 2 +-
 bin/templates/cordova/lib/emulator.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8783cf03/bin/templates/cordova/lib/device.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/device.js b/bin/templates/cordova/lib/device.js
index df2a33c..a50ac8e 100644
--- a/bin/templates/cordova/lib/device.js
+++ b/bin/templates/cordova/lib/device.js
@@ -64,7 +64,7 @@ module.exports.install = function(target) {
         var apk_path = build.get_apk();
         launchName = appinfo.getActivityName();
         console.log('Installing app on device...');
-        var cmd = 'adb -s ' + target + ' install -r ' + apk_path;
+        var cmd = 'adb -s ' + target + ' install -r "' + apk_path + '"';
         return exec(cmd);
     }).then(function(output) {
         if (output.match(/Failure/)) return Q.reject('ERROR: Failed to install apk to device:
' + output);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8783cf03/bin/templates/cordova/lib/emulator.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index 367cd94..fe24480 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -305,7 +305,7 @@ module.exports.install = function(target) {
 
         console.log('Installing app on emulator...');
         var apk_path = build.get_apk();
-        return exec('adb -s ' + target + ' install -r ' + apk_path);
+        return exec('adb -s ' + target + ' install -r "' + apk_path + '"');
     }).then(function(output) {
         if (output.match(/Failure/)) {
             return Q.reject('Failed to install apk to emulator: ' + output);


Mime
View raw message