Merge tag '2.1.2'

buildroot/bin/opt_set

@@ -3,10 +3,15 @@
 # exit on first failure
 set -e
 
-SED=$(which gsed || which sed)
+SED=$(which gsed sed | head -n1)
 
-# Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
-eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
-eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-eval "echo '#define ${@}' >>Marlin/Configuration_adv.h" ||
-(echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
+while [[ $# > 1 ]]; do
+  DID=0
+  for FN in Configuration Configuration_adv; do
+    "${SED}" -i "/^\(\s*\)\/*\s*\(#define\s\+${1}\b\) *\(.*\)$/{s//\1\2 ${2} \/\/ \3/;h};\${x;/./{x;q0};x;q9}" Marlin/$FN.h && DID=1
+  done
+  ((DID)) ||
+    eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||
+      (echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
+  shift 2
+done