Merge pull request #2140 from bootstraponline/exdev

Fix EXDEV error when using renameSync to move

lib/devices/android/adb.js

@@ -20,6 +20,7 @@ var spawn = require('win-spawn')
   , Logcat = require('./logcat.js')
   , isWindows = helpers.isWindows()
   , temp = require('temp')
+  , mv = require('mv')
   , helperJarPath = path.resolve(__dirname, 'helpers');
 
 
@@ -461,10 +462,9 @@ ADB.prototype.zipAlignApk = function (apk, cb) {
         return cb(new Error("zipAlignApk failed. " + err));
       }
 
-      if (fs.existsSync(apk)) fs.unlinkSync(apk);
-      fs.renameSync(alignedApk, apk);
-
-      cb();
+      mv(alignedApk, apk, { mkdirp: true }, function (err) {
+        cb(err);
+      });
     });
   }.bind(this));
 };

package.json

@@ -80,7 +80,8 @@
     "bytes": "~0.2.1",
     "appium-atoms": "~0.0.5",
     "appium-instruments": "~0.1.6",
-    "appium-uiauto": "~0.0.13"
+    "appium-uiauto": "~0.0.13",
+    "mv": "~2.0.0"
   },
   "scripts": {
     "test": "grunt travis"