Merge pull request #3906 from thinkyhead/rc_fix_travis_helpers

Less greedy regex in travis helper scripts
This commit is contained in:
Scott Lahteine 2016-05-30 00:27:41 -07:00
commit 7ba8f2dbc3
6 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash
for opt in "$@" ; do
eval "sed -i 's/\(\/\/ *\)*\(\#define *$opt\)/\/\/\2/g' Marlin/Configuration.h"
eval "sed -i 's/\(\/\/ *\)*\(\#define +$opt[^a-zA-Z0-9_]\)/\/\/\2/g' Marlin/Configuration.h"
done

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash
for opt in "$@" ; do
eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration.h"
eval "sed -i 's/\/\/ *\(#define +$opt[^a-zA-Z0-9_]\)/\1/g' Marlin/Configuration.h"
done

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash
for opt in "$@" ; do
eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration_adv.h"
eval "sed -i 's/\/\/ *\(#define +$opt[^a-zA-Z0-9_]\)/\1/g' Marlin/Configuration_adv.h"
done

View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash
eval "sed -i 's/\(#define *$1\) *.*$/\1 $2/g' Marlin/Configuration.h"
eval "sed -i 's/\(#define +$1 +\)[^ ]*$/\1 $2/g' Marlin/Configuration.h"

View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash
eval "sed -i 's/\(#define *$1\) *.*$/\1 $2/g' Marlin/Configuration_adv.h"
eval "sed -i 's/\(#define +$1 +\)[^ ]*$/\1 $2/g' Marlin/Configuration_adv.h"

View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash
eval "sed -i 's/\(#define *$2\) *.*$/\1 $3/g' Marlin/pins_$1.h"
eval "sed -i 's/\(#define +$2 +\)[^ ]*$/\1 $3/g' Marlin/pins_$1.h"