Commit ad7f0dfe by Tom de Vries Committed by Tom de Vries

check_GNU_style.sh: Don't cat empty file

2015-05-18  Tom de Vries  <tom@codesourcery.com>

	* check_GNU_style.sh (g, ag, vg): Don't cat empty file.

From-SVN: r223284
parent 847b6e15
2015-05-18 Tom de Vries <tom@codesourcery.com> 2015-05-18 Tom de Vries <tom@codesourcery.com>
* check_GNU_style.sh (g, ag, vg): Don't cat empty file.
2015-05-18 Tom de Vries <tom@codesourcery.com>
* check_GNU_style.sh (g, ag, vg, col): Declare local vars with local. * check_GNU_style.sh (g, ag, vg, col): Declare local vars with local.
2015-05-18 Tom de Vries <tom@codesourcery.com> 2015-05-18 Tom de Vries <tom@codesourcery.com>
......
...@@ -84,10 +84,16 @@ grep $format '^+' $files \ ...@@ -84,10 +84,16 @@ grep $format '^+' $files \
g (){ g (){
local msg="$1" local msg="$1"
local arg="$2" local arg="$2"
local found=false
cat $inp \ cat $inp \
| egrep --color=always -- "$arg" \ | egrep --color=always -- "$arg" \
> $tmp && printf "\n$msg\n" > "$tmp" && found=true
cat $tmp
if $found; then
printf "\n$msg\n"
cat "$tmp"
fi
} }
# And Grep # And Grep
...@@ -95,11 +101,17 @@ ag (){ ...@@ -95,11 +101,17 @@ ag (){
local msg="$1" local msg="$1"
local arg1="$2" local arg1="$2"
local arg2="$3" local arg2="$3"
local found=false
cat $inp \ cat $inp \
| egrep --color=always -- "$arg1" \ | egrep --color=always -- "$arg1" \
| egrep --color=always -- "$arg2" \ | egrep --color=always -- "$arg2" \
> $tmp && printf "\n$msg\n" > "$tmp" && found=true
cat $tmp
if $found; then
printf "\n$msg\n"
cat "$tmp"
fi
} }
# reVerse Grep # reVerse Grep
...@@ -107,11 +119,17 @@ vg (){ ...@@ -107,11 +119,17 @@ vg (){
local msg="$1" local msg="$1"
local varg="$2" local varg="$2"
local arg="$3" local arg="$3"
local found=false
cat $inp \ cat $inp \
| egrep -v -- "$varg" \ | egrep -v -- "$varg" \
| egrep --color=always -- "$arg" \ | egrep --color=always -- "$arg" \
> $tmp && printf "\n$msg\n" > "$tmp" && found=true
cat $tmp
if $found; then
printf "\n$msg\n"
cat "$tmp"
fi
} }
col (){ col (){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment