make sure binaries found using which/where get added to adb.inaries (fix

#2237)
appium · Apr 4, 2014 · f4b25ac · f4b25ac
1 parent 5ceb9bb
commit f4b25ac
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/devices/android/adb.js b/lib/devices/android/adb.js
@@ -108,7 +108,8 @@ ADB.prototype.checkSdkBinaryPresent = function (binary, cb) {
     exec(cmd + " " + binary, { maxBuffer: 524288 }, function (err, stdout) {
       if (stdout) {
         this.debug("Using " + binary + " from " + stdout);
-        cb(null, stdout);
+        this.binaries[binary] = stdout.trim();
+        cb(null, this.binaries[binary]);
       } else {
         cb(new Error("Could not find " + binary + "; do you have the Android " +
                      "SDK installed and the tools + platform-tools folders " +
@@ -462,9 +463,7 @@ ADB.prototype.zipAlignApk = function (apk, cb) {
         return cb(new Error("zipAlignApk failed. " + err));
       }
 
-      mv(alignedApk, apk, { mkdirp: true }, function (err) {
-        cb(err);
-      });
+      mv(alignedApk, apk, { mkdirp: true }, cb);
     });
   }.bind(this));
 };