zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add'l CI/git script tweaks, fixes

Browse source
This commit is contained in:
Scott Lahteine 2020-08-10 20:03:13 -05:00
parent f62578efec
commit 6dd054895b
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildroot/bin/use_example_configs
View file

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

3
buildroot/share/fonts/uxggenpages.sh
View file

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

3
buildroot/share/git/ghtp
View file

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

3
buildroot/share/git/mfclean
View file

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