noah/cbuild.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use grep -c instead of grep | wc -l

Browse source
This commit is contained in:
Noah Swerhun 2021-12-25 23:56:55 -06:00
parent 0e8435d889
commit 04a58ffa04
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.cbuild_prog.tmp
View file

@ -1 +0,0 @@
0

4
cbuild.sh
View file

@ -115,7 +115,7 @@ build() {
gen_makefile gen_makefile
[ ! -d "${OBJDIR}" ] && mkdir "${OBJDIR}" [ ! -d "${OBJDIR}" ] && mkdir "${OBJDIR}"
export_vars export_vars
make -f "${MAKEFILE}" -e "${TARGET}" -n | grep "^${CC}" | wc -l > .cbuild_prog.tmp make -f "${MAKEFILE}" -e "${TARGET}" -n | grep -c "^${CC}" > .cbuild_prog.tmp
if [ "$(cat .cbuild_prog.tmp)" = 0 ]; then if [ "$(cat .cbuild_prog.tmp)" = 0 ]; then
info "Target ${TARGET} up to date" info "Target ${TARGET} up to date"
rm .cbuild_prog.tmp rm .cbuild_prog.tmp
@ -157,7 +157,7 @@ dry_run() {
__progress__() { __progress__() {
ntargets=$(cat .cbuild_prog.tmp) ntargets=$(cat .cbuild_prog.tmp)
export_vars export_vars
rtargets="$(make -f "${MAKEFILE}" -e "${TARGET}" -n | grep "^${CC}" | wc -l)" rtargets="$(make -f "${MAKEFILE}" -e "${TARGET}" -n | grep -c "^${CC}")"
targetno=$((${ntargets} - ${rtargets} + 1)) targetno=$((${ntargets} - ${rtargets} + 1))
if [ "${1}" = "object" ]; then if [ "${1}" = "object" ]; then
printf '[%3d/%d] ' "${targetno}" "${ntargets}" printf '[%3d/%d] ' "${targetno}" "${ntargets}"