Browse Source

Add'l CI/git script tweaks, fixes

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
commit
6dd054895b
  1. 6
      buildroot/bin/use_example_configs
  2. 3
      buildroot/share/fonts/uxggenpages.sh
  3. 3
      buildroot/share/git/ghtp
  4. 3
      buildroot/share/git/mfclean

6
buildroot/bin/use_example_configs

@ -13,9 +13,9 @@ restore_configs
cd Marlin
$TOOL "$EXAMPLES/$RDIR/Configuration.h" >/dev/null 2>&1 && mv wgot Configuration.h
$TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration.h
$TOOL "$EXAMPLES/$RDIR/_Bootscreen.h" >/dev/null 2>&1 && mv wgot Configuration.h
$TOOL "$EXAMPLES/$RDIR/_Statusscreen.h" >/dev/null 2>&1 && mv wgot Configuration.h
$TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
$TOOL "$EXAMPLES/$RDIR/_Bootscreen.h" >/dev/null 2>&1 && mv wgot _Bootscreen.h
$TOOL "$EXAMPLES/$RDIR/_Statusscreen.h" >/dev/null 2>&1 && mv wgot _Statusscreen.h
rm -f wgot
cd - >/dev/null

3
buildroot/share/fonts/uxggenpages.sh

@ -139,8 +139,7 @@ BEGIN {
}
EOF
which awk >/dev/null && AWK=awk
which gawk >/dev/null && AWK=gawk
AWK=$(which gawk || which awk)
grep -Hrn _UxGT . | grep '"' \
| sed 's/_UxGT("/\n&/g;s/[^\n]*\n_UxGT("\([^"]*\)[^\n]*/\1 /g;s/.$//' \

3
buildroot/share/git/ghtp

@ -20,8 +20,7 @@ case "$1" in
;;
esac
which awk >/dev/null && AWK=awk
which gawk >/dev/null && AWK=gawk
AWK=$(which gawk || which awk)
REMOTES=$(git remote -v | egrep "\t$MATCH" | "$AWK" '{print $1 " " $2}' | sort -u | sed "s/$FORMULA/")

3
buildroot/share/git/mfclean

@ -6,8 +6,7 @@
# Great way to clean up your branches after messing around a lot
#
which awk >/dev/null && AWK=awk
which gawk >/dev/null && AWK=gawk
AWK=$(which gawk || which awk)
KEEP="RC|RCBugFix|dev|master|bugfix-1|bugfix-2"

Loading…
Cancel
Save