Fixing logic error

Fixes #5920
elastic · Jan 16, 2016 · f80ef70 · f80ef70
1 parent 9a0be4e
commit f80ef70
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/cli/plugin/setting_parser.js b/src/cli/plugin/setting_parser.js
@@ -22,6 +22,16 @@ export default function createSettingParser(options) {
     return 'https://download.elastic.co/' + settings.organization + '/' + settings.package + '/' + filename;
   }
 
+  function areMultipleOptionsChosen(options, choices) {
+    let numChosen = 0;
+    choices.forEach(function (choice) {
+      if (options[choice]) {
+        ++numChosen;
+      }
+    });
+    return (numChosen > 1);
+  }
+
   function parse() {
     let parts;
     let settings = {
@@ -88,7 +98,7 @@ export default function createSettingParser(options) {
       settings.action = 'list';
     }
 
-    if (!settings.action || (options.install && options.remove && options.list)) {
+    if (!settings.action || areMultipleOptionsChosen(options, [ 'install', 'remove', 'list' ])) {
       throw new Error('Please specify either --install, --remove, or --list.');
     }