From 04a58ffa045d1f7b7fef392c9f369f8aa421cb14 Mon Sep 17 00:00:00 2001 From: Noah Swerhun Date: Sat, 25 Dec 2021 23:56:55 -0600 Subject: [PATCH] use grep -c instead of grep | wc -l --- .cbuild_prog.tmp | 1 - cbuild.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 .cbuild_prog.tmp diff --git a/.cbuild_prog.tmp b/.cbuild_prog.tmp deleted file mode 100644 index 573541a..0000000 --- a/.cbuild_prog.tmp +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/cbuild.sh b/cbuild.sh index 3c9c7b3..6b5445e 100755 --- a/cbuild.sh +++ b/cbuild.sh @@ -115,7 +115,7 @@ build() { gen_makefile [ ! -d "${OBJDIR}" ] && mkdir "${OBJDIR}" 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 info "Target ${TARGET} up to date" rm .cbuild_prog.tmp @@ -157,7 +157,7 @@ dry_run() { __progress__() { ntargets=$(cat .cbuild_prog.tmp) 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)) if [ "${1}" = "object" ]; then printf '[%3d/%d] ' "${targetno}" "${ntargets}"