[73/91] [abbrv] git commit: fixing legacy android 1.0 plugins.xml

[an...@apache.org]

fixing legacy android 1.0 plugins.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/acd44cdb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/acd44cdb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/acd44cdb

Branch: refs/heads/master
Commit: acd44cdbba4989874507db9e2d7bbdac0eedeea1
Parents: 52892fd
Author: Anis Kadri <an...@gmail.com>
Authored: Sat Feb 2 19:04:29 2013 -0800
Committer: Anis Kadri <an...@gmail.com>
Committed: Sat Feb 2 19:04:29 2013 -0800

----------------------------------------------------------------------
 platforms/android.js |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/acd44cdb/platforms/android.js
----------------------------------------------------------------------
diff --git a/platforms/android.js b/platforms/android.js
index 0a25da9..f7ce866 100644
--- a/platforms/android.js
+++ b/platforms/android.js
@@ -1,5 +1,6 @@
 var fs = require('fs')  // use existsSync in 0.6.x
    , path = require('path')
+   , util = require('util')
    , shell = require('shelljs')
    , et = require('elementtree')
    , getConfigChanges = require('../util/config-changes')
@@ -163,8 +164,12 @@ function androidPackageName(project_dir) {
 }
 
 function pluginInstalled(plugin_et, project_dir) {
-    var config_tag = plugin_et.find('./platform[@name="android"]/config-file[@target="res/xml/config.xml"]/plugin')
-    var plugin_name = config_tag.attrib.name;
-    return (fs.readFileSync(path.resolve(project_dir, 'res/xml/config.xml'), 'utf8')
+    var filename = 'res/xml/config.xml';
+    if(fs.existsSync(path.resolve(project_dir, 'res/xml/plugins.xml'))) {
+        filename = 'res/xml/plugins.xml';
+    }
+    var tag_xpath = util.format('./platform[@name="android"]/config-file[@target="%s"]/plugin', filename);
+    var plugin_name = plugin_et.find(tag_xpath).attrib.name;
+    return (fs.readFileSync(path.resolve(project_dir, filename), 'utf8')
            .match(new RegExp(plugin_name, "g")) != null);
 }