From 62fa2816b0c16a7fd66f7663872b9d7fc81a4038 Mon Sep 17 00:00:00 2001
From: Payman Delshad <paymand@opera.com>
Date: Thu, 17 Apr 2014 14:32:35 +0200
Subject: [PATCH] Allow for whitespace in app path.

---
 lib/devices/android/adb.js | 2 +-
 lib/devices/ios/ios.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/devices/android/adb.js b/lib/devices/android/adb.js
index c8ebfd93c..2cd63ea6c 100644
--- a/lib/devices/android/adb.js
+++ b/lib/devices/android/adb.js
@@ -180,7 +180,7 @@ ADB.prototype.processFromManifest = function (localApk, cb) {
   this.checkAaptPresent(function (err) {
     if (err) return cb(err);
 
-    var extractProcess = [this.binaries.aapt, 'dump', 'xmltree', localApk, 'AndroidManifest.xml'].join(' ');
+    var extractProcess = [this.binaries.aapt, 'dump', 'xmltree', '"' + localApk + '"', 'AndroidManifest.xml'].join(' ');
     logger.debug("processFromManifest: " + extractProcess);
     exec(extractProcess, { maxBuffer: 524288 }, function (err, stdout, stderr) {
       if (err || stderr) {
diff --git a/lib/devices/ios/ios.js b/lib/devices/ios/ios.js
index e19fa8e82..d89ad1774 100644
--- a/lib/devices/ios/ios.js
+++ b/lib/devices/ios/ios.js
@@ -1275,7 +1275,7 @@ IOS.prototype.removeApp = function (bundleId, cb) {
 IOS.prototype.installApp = function (unzippedAppPath, cb) {
   if (this.args.udid) {
     var installQuietFlag = this.args.quiet ? ' -q' : '';
-    var installationCommand = fruitstrap + installQuietFlag + ' install --id ' + this.args.udid + ' --bundle ' + unzippedAppPath;
+    var installationCommand = fruitstrap + installQuietFlag + ' install --id ' + this.args.udid + ' --bundle "' + unzippedAppPath + '"';
     deviceCommon.installApp(installationCommand, this.args.udid, unzippedAppPath, cb);
   } else {
     cb(new Error("You can not call installApp for the iOS simulator!"));