Repository: cordova-lib Updated Branches: refs/heads/master 38415d0e3 -> 990f2c63b
CB-10611 fix before_plugin_install hook not disabled with --nohooks This closes #388 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/990f2c63 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/990f2c63 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/990f2c63 Branch: refs/heads/master Commit: 990f2c63b83cccfb2773cc0e45197841efdf8fe6 Parents: 38415d0 Author: Byoungro So <[email protected]> Authored: Sun Feb 14 17:11:40 2016 -0800 Committer: Tim Barham <[email protected]> Committed: Tue Feb 16 17:48:02 2016 +1000 ---------------------------------------------------------------------- cordova-lib/src/cordova/plugin.js | 3 ++- cordova-lib/src/plugman/install.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/990f2c63/cordova-lib/src/cordova/plugin.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index f57f6eb..d35e7a2 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -188,7 +188,8 @@ module.exports = function plugin(command, targets, opts) { // instead of <platform>/www. This is required since on each prepare platform's www dir is changed // and files from 'platform_www' merged into 'www'. Thus we need to persist these // files platform_www directory, so they'll be applied to www on each prepare. - usePlatformWww: true + usePlatformWww: true, + nohooks: opts.nohooks }; events.emit('verbose', 'Calling plugman.install on plugin "' + pluginInfo.dir + '" for platform "' + platform); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/990f2c63/cordova-lib/src/plugman/install.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js index d0e87df..b7f0d88 100644 --- a/cordova-lib/src/plugman/install.js +++ b/cordova-lib/src/plugman/install.js @@ -381,7 +381,8 @@ function runInstall(actions, platform, project_dir, plugin_dir, plugins_dir, opt pluginInfo: pluginInfo, platform: install.platform, dir: install.top_plugin_dir - } + }, + nohooks: options.nohooks }; var hooksRunner = new HooksRunner(projectRoot); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
