File tree Expand file tree Collapse file tree 2 files changed +11
-3
lines changed Expand file tree Collapse file tree 2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,8 @@ stop: # stop app
8
8
b build: lint # build app for environment [vars: env]
9
9
[[ -n $(env) ]] && echo "buiding app for $(env)" || echo "error: missing env"
10
10
11
- t test: build # run all tests or specific tests [vars: name1, name2, etc.]
11
+ t test: # run all tests or specific tests [vars: name1, name2, etc.]
12
+ run build env=test
12
13
[[ -n $(@) ]] && echo "running tests $(@)" || echo "running all tests"
13
14
14
15
l lint: # lint all files or specific file [vars: file]
Original file line number Diff line number Diff line change 184
184
if ! (( ${# cmd_args[@]} ))
185
185
then
186
186
# Case where no named arguments were provided: replace $( abc) $( xyz) etc.
187
- buffer="$( echo " ${buffer} " | sed -E ' s!\$\([a-zA-Z_][a-zA-Z0-9_]*\)!``!g' ) "
187
+ # Note: There must be at least one lowercase letter [a-z] in these matches,
188
+ # because otherwise we'd replace built in Make vars like $( MAKEFILE_LIST)
189
+ # which we want to leave alone.
190
+ buffer="$( echo " ${buffer} " | sed -E ' s!\$\([a-zA-Z0-9_]*[a-z][a-zA-Z0-9_]*\)!``!g' ) "
188
191
fi
189
192
if ! (( ${# pos_args[@]} ))
190
193
then
247
250
then
248
251
make_args+=( "${cmd} " )
249
252
fi
253
+ if (( ${# cmd_args[@]} ))
254
+ then
255
+ make_args+=( -- "${cmd_args[@]} " )
256
+ fi
250
257
251
- make --makefile "${makefile} " "${make_args[@]} " -- " ${cmd_args[@]} "
258
+ make --makefile "${makefile} " "${make_args[@]} "
252
259
253
260
# Clean up temporary Makefile and exit with success:
254
261
rm "${makefile} "
You can’t perform that action at this time.
0 commit comments