From 75faec10e585660c7fd0d64d3c9509a710476b32 Mon Sep 17 00:00:00 2001
From: bootstraponline <code@bootstraponline.com>
Date: Mon, 24 Mar 2014 09:37:11 -0400
Subject: [PATCH] Fix EXDEV error when using renameSync to move

---
 lib/devices/android/adb.js | 8 ++++----
 package.json               | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/devices/android/adb.js b/lib/devices/android/adb.js
index 3a38ee2e7..08cae0597 100644
--- a/lib/devices/android/adb.js
+++ b/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));
 };
diff --git a/package.json b/package.json
index d779ea8af..81b4984b8 100644
--- a/package.json
+++ b/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"