From 1290c534bef72b282b4c562b95a4b2be8237e3b0 Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Sat, 5 Feb 2022 00:40:45 +0000 Subject: [PATCH] g: show all file names when grepping When grep gets a single file argument, it does not show the file name. This makes seeing the file name in the output of 'g' difficult. Pass a spare /dev/null to each invocation of g, in order to force it to show the file name. --- rc/bin/g | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rc/bin/g b/rc/bin/g index 5f55715a0..aa57d17e8 100755 --- a/rc/bin/g +++ b/rc/bin/g @@ -23,6 +23,7 @@ shift suffixes='\.([bcChlmsy]|asm|awk|cc|cgi|cpp|cs|go|goc|hs|java|lua|lx|mk|ml|mli|ms|myr|pl|py|rc|sh|tex|xy)$' fullnames='(^|/)mkfile$' +repodirs='(^|/)(.git|.hg)($|/)' switch($#*){ case 0 walk -f $recurse | grep -e $fullnames -e $suffixes >[2]/dev/null @@ -34,4 +35,4 @@ case * if not echo $f } -} | xargs grep -n $flags -- $pattern +} | grep -v $repodirs | xargs grep -n $flags -- $pattern /dev/null