tidy up some awk invocations

diff --git a/do_merge b/do_merge
index d1c52e71dea8bf4ba672b21ed1cea5d416f0e778..391fbee01a43508ba09ad4eece8bc661c3f40fa8 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -91,7 +91,7 @@ do_rebase()
 
 }
 
-heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }')
+heads=$(awk -F '\t' '/^#/ { next; } $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
 
 need_build=false
 
@@ -179,7 +179,7 @@ for h in $heads; do
        }
        $need_build ||
                continue
-       do_build=$(grep -v '^#' $CTRL_FILE | awk -F '   ' '$3=="'$tree'" { print $6; }')
+       do_build=$(awk -F '\t' '/^[^#]/ && $3=="'$tree'" { print $6; }' "$CTRL_FILE")
        [ "$do_build" = "yes" ] ||
                continue
        git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {

diff --git a/update_trees b/update_trees
index 5d4e90a7217863fa52b29b16a2e86f818a049a20..b09a01aa392458fe2db37a74d58853a2ab359471 100755 (executable)
--- a/update_trees
+++ b/update_trees
@@ -19,14 +19,14 @@ execute()
 
 cpwd=$(pwd)
 
-quilters=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '$2=="quilt" { print $3; }')
+quilters=$(awk -F '\t' '/^[^#]/ && $2=="quilt" { print $3; }' "$CTRL_FILE")
 
 for name in $quilters; do
 
        sfile="../quilt/$name/series"
        base=$(sed -n 's/^#[ \t]*NEXT[-_]BASE[ \t]*\([^ \t]*\)[ \t]*$/\1/p' "$sfile")
        if [ -n "$base" ]; then
-               nbase=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '$3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }')
+               nbase=$(awk -F '\t' '/^[^#]/ && $3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }' "$CTRL_FILE")
                [ -n "$nbase" ] && base="$nbase"
        else
                base=$(sed -n 's/^#[ \t]*BASE[ \t]*\(.*\)[ \t]*$/\1/p' "$sfile")