From 1cd1ccbf86b9eabd2c2991baa3e1b835e6fb2331 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Tue, 22 Mar 2016 22:32:42 -0700
Subject: [PATCH] Enable/disable multiple options on a single line.

---
 .travis.yml                    | 29 ++++++++---------------------
 LinuxAddons/bin/opt_disable    |  4 +++-
 LinuxAddons/bin/opt_enable     |  4 +++-
 LinuxAddons/bin/opt_enable_adv |  4 +++-
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 567b89303..cfcee4f77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,16 +63,11 @@ script:
   - build_marlin
   # enable AUTO_BED_LEVELING with servos
   - restore_configs
-  - opt_enable ENABLE_AUTO_BED_LEVELING
-  - opt_enable NUM_SERVOS
-  - opt_enable Z_ENDSTOP_SERVO_NR
-  - opt_enable SERVO_ENDSTOP_ANGLES
-  - opt_enable DEACTIVATE_SERVOS_AFTER_MOVE
+  - opt_enable ENABLE_AUTO_BED_LEVELING NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
   - build_marlin
   # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
   - restore_configs
-  - opt_enable EEPROM_SETTINGS
-  - opt_enable EEPROM_CHITCHAT
+  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
   - build_marlin
   ### LCDS ###
   # ULTIMAKERCONTROLLER
@@ -86,13 +81,11 @@ script:
   #- build_marlin
   # REPRAP_DISCOUNT_SMART_CONTROLLER
   - restore_configs
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
-  - opt_enable SDSUPPORT
+  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
   - build_marlin
   # G3D_PANEL
   - restore_configs
-  - opt_enable G3D_PANEL
-  - opt_enable SDSUPPORT
+  - opt_enable G3D_PANEL SDSUPPORT
   - build_marlin
   # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
   - restore_configs
@@ -101,9 +94,7 @@ script:
   # REPRAPWORLD_KEYPAD
   # Cant find configuration details to get it to compile
   #- restore_configs
-  #- opt_enable ULTRA_LCD
-  #- opt_enable REPRAPWORLD_KEYPAD
-  #- opt_enable REPRAPWORLD_KEYPAD_MOVE_STEP
+  #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
   #- build_marlin
   # RA_CONTROL_PANEL
   - restore_configs
@@ -137,9 +128,7 @@ script:
   - build_marlin
   # Enable filament sensor with LCD display
   - restore_configs
-  - opt_enable ULTIMAKERCONTROLLER
-  - opt_enable FILAMENT_SENSOR
-  - opt_enable FILAMENT_LCD_DISPLAY
+  - opt_enable ULTIMAKERCONTROLLER FILAMENT_SENSOR FILAMENT_LCD_DISPLAY
   - build_marlin
   # Enable COREXY
   - restore_configs
@@ -151,8 +140,7 @@ script:
   - build_marlin
   # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
   - restore_configs
-  - opt_enable_adv Z_DUAL_STEPPER_DRIVERS
-  - opt_enable_adv Z_DUAL_ENDSTOPS
+  - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
   - pins_set RAMPS_14 X_MAX_PIN -1
   - opt_set_adv Z2_MAX_PIN 2
   - build_marlin
@@ -164,8 +152,7 @@ script:
   # Delta Config (generic) + ABL + ALLEN_KEY
   - use_example_configs delta/generic
   - opt_disable DISABLE_MIN_ENDSTOPS
-  - opt_enable AUTO_BED_LEVELING_FEATURE
-  - opt_enable Z_PROBE_ALLEN_KEY
+  - opt_enable AUTO_BED_LEVELING_FEATURE Z_PROBE_ALLEN_KEY
   - build_marlin
   # Delta Config (Mini Kossel)
   - use_example_configs delta/kossel_mini
diff --git a/LinuxAddons/bin/opt_disable b/LinuxAddons/bin/opt_disable
index f321a6304..36646dbe6 100755
--- a/LinuxAddons/bin/opt_disable
+++ b/LinuxAddons/bin/opt_disable
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
-eval "sed 's/\(\/\/ *\)*\(\#define *$1\)/\/\/\2/g' Marlin/Configuration.h"
+for opt in "$@" ; do
+  eval "sed -i 's/\(\/\/ *\)*\(\#define *$opt\)/\/\/\2/g' Marlin/Configuration.h"
+done
diff --git a/LinuxAddons/bin/opt_enable b/LinuxAddons/bin/opt_enable
index 6820db2aa..42233f063 100755
--- a/LinuxAddons/bin/opt_enable
+++ b/LinuxAddons/bin/opt_enable
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
-eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration.h"
+for opt in "$@" ; do
+  eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration.h"
+done
diff --git a/LinuxAddons/bin/opt_enable_adv b/LinuxAddons/bin/opt_enable_adv
index 30b2ddbf3..89dfce121 100755
--- a/LinuxAddons/bin/opt_enable_adv
+++ b/LinuxAddons/bin/opt_enable_adv
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
-eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration_adv.h"
+for opt in "$@" ; do
+  eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration_adv.h"
+done