Browse Source

Tweak opt_set, opt_enable

Scott Lahteine 3 years ago
parent
commit
3107d8a0f4
2 changed files with 4 additions and 4 deletions
  1. 2
    2
      buildroot/bin/opt_enable
  2. 2
    2
      buildroot/bin/opt_set

+ 2
- 2
buildroot/bin/opt_enable View File

7
 
7
 
8
 for opt in "$@" ; do
8
 for opt in "$@" ; do
9
   # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
9
   # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
10
-  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
11
-  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
10
+  eval "${SED} -i '/^\([[:blank:]]*\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
11
+  eval "${SED} -i '/^\([[:blank:]]*\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
12
   (echo "ERROR: opt_enable Can't find ${opt}" >&2 && exit 9)
12
   (echo "ERROR: opt_enable Can't find ${opt}" >&2 && exit 9)
13
 done
13
 done

+ 2
- 2
buildroot/bin/opt_set View File

8
 ARGC=$#
8
 ARGC=$#
9
 while [[ $# > 1 ]]; do
9
 while [[ $# > 1 ]]; do
10
   # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
10
   # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
11
-  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
12
-  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
11
+  eval "${SED} -i '/^\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\1\3\4 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
12
+  eval "${SED} -i '/^\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\1\3\4 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
13
   eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||
13
   eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||
14
   (echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
14
   (echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
15
   shift 2
15
   shift 2

Loading…
Cancel
Save