Ubuntu support for the new plugin naming convention
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/30b91b2b Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/30b91b2b Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/30b91b2b Branch: refs/heads/master Commit: 30b91b2b3583e9cb68a25390d521671564511122 Parents: debc6f2 Author: David Barth <[email protected]> Authored: Tue Sep 1 19:40:35 2015 +0200 Committer: Steve Gill <[email protected]> Committed: Tue Nov 24 17:58:06 2015 -0800 ---------------------------------------------------------------------- cordova-lib/src/plugman/platforms/ubuntu.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/30b91b2b/cordova-lib/src/plugman/platforms/ubuntu.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/ubuntu.js b/cordova-lib/src/plugman/platforms/ubuntu.js index acf3212..727e4e6 100644 --- a/cordova-lib/src/plugman/platforms/ubuntu.js +++ b/cordova-lib/src/plugman/platforms/ubuntu.js @@ -71,7 +71,13 @@ module.exports = { var src = String(fs.readFileSync(plugins)); src = src.replace('INSERT_HEADER_HERE', '#include "plugins/' + plugin_id + '/' + path.basename(obj.src) +'"\nINSERT_HEADER_HERE'); - var class_name = plugin_id.match(/\.[^.]+$/)[0].substr(1); + var class_name; + if (plugin_id.match(/\.[^.]+$/)) { + // old-style plugin name + class_name = plugin_id.match(/\.[^.]+$/)[0].substr(1); + } else { + class_name = plugin_id.match(/\-[^\-]+$/)[0].substr(1); + } class_name = toCamelCase(class_name); src = src.replace('INSERT_PLUGIN_HERE', 'INIT_PLUGIN(' + class_name + ');INSERT_PLUGIN_HERE'); @@ -85,7 +91,13 @@ module.exports = { var src = String(fs.readFileSync(plugins)); src = src.replace('#include "plugins/' + plugin_id + '/' + path.basename(obj.src) +'"', ''); - var class_name = plugin_id.match(/\.[^.]+$/)[0].substr(1); + var class_name; + if (plugin_id.match(/\.[^.]+$/)) { + // old-style plugin name + class_name = plugin_id.match(/\.[^.]+$/)[0].substr(1); + } else { + class_name = plugin_id.match(/\-[^\-]+$/)[0].substr(1); + } class_name = toCamelCase(class_name); src = src.replace('INIT_PLUGIN(' + class_name + ');', ''); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
