github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle undefined options when looking for 'pluginDir' (#15532) (#15536)

Browse source 
* Handle undefined options when looking for 'pluginDir'

* Use 'settings' instead of 'options'
This commit is contained in:
Kim Joar Bekkelund 2017-12-12 01:41:49 +01:00 • committed by GitHub
parent f4e94f70b0
commit 13f8bbec55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cli_plugin/install/index.js
View file

@ -18,7 +18,7 @@ function processCommand(command, options) {
const logger = new Logger(settings);
warnIfUsingPluginDirOption(options, fromRoot('plugins'), logger);
warnIfUsingPluginDirOption(settings, fromRoot('plugins'), logger);
logWarnings(settings, logger);
install(settings, logger);
}

2
src/cli_plugin/lib/warn_if_plugin_dir_option.js
View file

@ -1,5 +1,5 @@
export function warnIfUsingPluginDirOption(options, defaultValue, logger) {
if (options.pluginDir !== defaultValue) {
if (options && options.pluginDir !== defaultValue) {
logger.log(
'Warning: Using the -d, --plugin-dir option is deprecated, and is ' +
'known to not work for all plugins, including X-Pack.'

2
src/cli_plugin/list/index.js
View file

@ -17,7 +17,7 @@ function processCommand(command, options) {
const logger = new Logger(settings);
warnIfUsingPluginDirOption(options, fromRoot('plugins'), logger);
warnIfUsingPluginDirOption(settings, fromRoot('plugins'), logger);
logWarnings(settings, logger);
list(settings, logger);
}

2
src/cli_plugin/remove/index.js
View file

@ -18,7 +18,7 @@ function processCommand(command, options) {
const logger = new Logger(settings);
warnIfUsingPluginDirOption(options, fromRoot('plugins'), logger);
warnIfUsingPluginDirOption(settings, fromRoot('plugins'), logger);
logWarnings(settings, logger);
remove(settings, logger);
}