do uninstall only when that app is installed (#451)

Author: drelaptop

bin/cocos.py

@@ -717,6 +717,15 @@ def get_xcode_version():
 
     return version
 
+def app_is_installed(adb_cmd, pack_name):
+    list_pack_cmd = "%s shell 'pm list packages'" % (adb_cmd)
+    desired_name = "package:%s" % (pack_name)
+    child = subprocess.Popen(list_pack_cmd, stdout=subprocess.PIPE, shell=True)
+    for line in child.stdout:
+        if desired_name == line.strip():
+            return True
+    return False
+
 def version_compare(a, op, b):
     '''Compares two version numbers to see if a op b is true
 

plugins/plugin_deploy.py

@@ -161,9 +161,10 @@ def deploy_android(self, dependencies):
         adb_path = cocos.CMDRunner.convert_path_to_cmd(os.path.join(sdk_root, 'platform-tools', 'adb'))
 
         if not self._no_uninstall:
-            #TODO detect if the application is installed before running this
-            adb_uninstall = "%s uninstall %s" % (adb_path, self.package)
-            self._run_cmd(adb_uninstall)
+            # do uninstall only when that app is installed
+            if cocos.app_is_installed(adb_path, self.package):
+                adb_uninstall = "%s uninstall %s" % (adb_path, self.package)
+                self._run_cmd(adb_uninstall)
 
         adb_install = "%s install -r \"%s\"" % (adb_path, apk_path)
         self._run_cmd(adb_install)