From 6dd054895b4566f7d63a629f3ab5f5aa890db8af Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 10 Aug 2020 20:03:13 -0500 Subject: [PATCH] Add'l CI/git script tweaks, fixes --- buildroot/bin/use_example_configs | 6 +++--- buildroot/share/fonts/uxggenpages.sh | 3 +-- buildroot/share/git/ghtp | 3 +-- buildroot/share/git/mfclean | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs index a7fe39a859..83c0f5485d 100755 --- a/buildroot/bin/use_example_configs +++ b/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 diff --git a/buildroot/share/fonts/uxggenpages.sh b/buildroot/share/fonts/uxggenpages.sh index 46ad438f9c..a99fd99024 100755 --- a/buildroot/share/fonts/uxggenpages.sh +++ b/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/.$//' \ diff --git a/buildroot/share/git/ghtp b/buildroot/share/git/ghtp index a2fac985dd..3c0e21e371 100755 --- a/buildroot/share/git/ghtp +++ b/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/") diff --git a/buildroot/share/git/mfclean b/buildroot/share/git/mfclean index b6ad2b5149..fd131c4263 100755 --- a/buildroot/share/git/mfclean +++ b/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"