Browse Source

Add'l CI/git script tweaks, fixes

Scott Lahteine 4 years ago
parent
commit
6dd054895b

+ 3
- 3
buildroot/bin/use_example_configs View File

13
 cd Marlin
13
 cd Marlin
14
 
14
 
15
 $TOOL "$EXAMPLES/$RDIR/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
15
 $TOOL "$EXAMPLES/$RDIR/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
16
-$TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration.h
17
-$TOOL "$EXAMPLES/$RDIR/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot Configuration.h
18
-$TOOL "$EXAMPLES/$RDIR/_Statusscreen.h"     >/dev/null 2>&1 && mv wgot Configuration.h
16
+$TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
17
+$TOOL "$EXAMPLES/$RDIR/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot _Bootscreen.h
18
+$TOOL "$EXAMPLES/$RDIR/_Statusscreen.h"     >/dev/null 2>&1 && mv wgot _Statusscreen.h
19
 
19
 
20
 rm -f wgot
20
 rm -f wgot
21
 cd - >/dev/null
21
 cd - >/dev/null

+ 1
- 2
buildroot/share/fonts/uxggenpages.sh View File

139
 }
139
 }
140
 EOF
140
 EOF
141
 
141
 
142
-which awk  >/dev/null && AWK=awk
143
-which gawk >/dev/null && AWK=gawk
142
+AWK=$(which gawk || which awk)
144
 
143
 
145
 grep -Hrn _UxGT . | grep '"' \
144
 grep -Hrn _UxGT . | grep '"' \
146
   | sed 's/_UxGT("/\n&/g;s/[^\n]*\n_UxGT("\([^"]*\)[^\n]*/\1 /g;s/.$//' \
145
   | sed 's/_UxGT("/\n&/g;s/[^\n]*\n_UxGT("\([^"]*\)[^\n]*/\1 /g;s/.$//' \

+ 1
- 2
buildroot/share/git/ghtp View File

20
     ;;
20
     ;;
21
 esac
21
 esac
22
 
22
 
23
-which awk  >/dev/null && AWK=awk
24
-which gawk >/dev/null && AWK=gawk
23
+AWK=$(which gawk || which awk)
25
 
24
 
26
 REMOTES=$(git remote -v | egrep "\t$MATCH" | "$AWK" '{print $1 " " $2}' | sort -u | sed  "s/$FORMULA/")
25
 REMOTES=$(git remote -v | egrep "\t$MATCH" | "$AWK" '{print $1 " " $2}' | sort -u | sed  "s/$FORMULA/")
27
 
26
 

+ 1
- 2
buildroot/share/git/mfclean View File

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

Loading…
Cancel
Save