From 35f831604b9b2254fe8f1eac59e92eef9fdeef35 Mon Sep 17 00:00:00 2001 From: Connor Pearson Date: Wed, 11 Feb 2015 19:50:32 -0500 Subject: [PATCH 1/2] CB-8457: Ignore version specifier when running hooks --- cordova-lib/src/hooks/HooksRunner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cordova-lib/src/hooks/HooksRunner.js b/cordova-lib/src/hooks/HooksRunner.js index 4191efd75..5ef012354 100644 --- a/cordova-lib/src/hooks/HooksRunner.js +++ b/cordova-lib/src/hooks/HooksRunner.js @@ -67,6 +67,7 @@ HooksRunner.prototype.prepareOptions = function(opts) { opts.projectRoot = this.projectRoot; opts.cordova = opts.cordova || {}; opts.cordova.platforms = opts.cordova.platforms || opts.platforms || cordovaUtil.listPlatforms(opts.projectRoot); + opts.cordova.platforms = opts.cordova.platforms.map(function(platform) { return platform.split("@")[0]; } ); opts.cordova.plugins = opts.cordova.plugins || opts.plugins || cordovaUtil.findPlugins(path.join(opts.projectRoot, 'plugins')); try { @@ -225,4 +226,4 @@ function extractSheBangInterpreter(fullpath) { if (shMatch) hookCmd = shMatch[1]; return hookCmd; -} \ No newline at end of file +} From 7b74f0a1e67289aef1fe262ee32b03339b34d370 Mon Sep 17 00:00:00 2001 From: Connor Pearson Date: Wed, 11 Feb 2015 21:21:12 -0500 Subject: [PATCH 2/2] Change to single quotes --- cordova-lib/src/hooks/HooksRunner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cordova-lib/src/hooks/HooksRunner.js b/cordova-lib/src/hooks/HooksRunner.js index 5ef012354..0eaa04db0 100644 --- a/cordova-lib/src/hooks/HooksRunner.js +++ b/cordova-lib/src/hooks/HooksRunner.js @@ -67,7 +67,7 @@ HooksRunner.prototype.prepareOptions = function(opts) { opts.projectRoot = this.projectRoot; opts.cordova = opts.cordova || {}; opts.cordova.platforms = opts.cordova.platforms || opts.platforms || cordovaUtil.listPlatforms(opts.projectRoot); - opts.cordova.platforms = opts.cordova.platforms.map(function(platform) { return platform.split("@")[0]; } ); + opts.cordova.platforms = opts.cordova.platforms.map(function(platform) { return platform.split('@')[0]; } ); opts.cordova.plugins = opts.cordova.plugins || opts.plugins || cordovaUtil.findPlugins(path.join(opts.projectRoot, 'plugins')); try {