Browse Source

Replace `` by $() syntax in shell scripts.

$() is easier to nest and POSIX, which we require in other places.
tags/n0.8
Diego Biurrun 14 years ago
parent
commit
6252040e77
2 changed files with 8 additions and 8 deletions
  1. +1
    -1
      tools/clean-diff
  2. +7
    -7
      tools/patcheck

+ 1
- 1
tools/clean-diff View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
sed '/^+[^+]/!s/ /TaBBaT/g' |\ sed '/^+[^+]/!s/ /TaBBaT/g' |\
expand -t `seq -s , 9 8 200` |\
expand -t $(seq -s , 9 8 200) |\
sed 's/TaBBaT/ /g' |\ sed 's/TaBBaT/ /g' |\
sed '/^+[^+]/s/ * $//' |\ sed '/^+[^+]/s/ * $//' |\
tr -d '\015' |\ tr -d '\015' |\


+ 7
- 7
tools/patcheck View File

@@ -12,7 +12,7 @@ GREP=grep
EGREP=egrep EGREP=egrep
TMP=patcheck.tmp TMP=patcheck.tmp
OPT="-nH" OPT="-nH"
#FILES=`$GREP '^+++' $* | sed 's/+++ //g'`
#FILES=$($GREP '^+++' $* | sed 's/+++ //g')


echo patCHeck 1e10.0 echo patCHeck 1e10.0
echo This tool is intended to help a human check/review patches it is very far from echo This tool is intended to help a human check/review patches it is very far from
@@ -43,7 +43,7 @@ hiegrep2(){
} }


hiegrep '[[:space:]]$' 'trailing whitespace' $* hiegrep '[[:space:]]$' 'trailing whitespace' $*
hiegrep "`echo x | tr 'x' '\t'`" 'tabs' $*
hiegrep "$(echo x | tr 'x' '\t')" 'tabs' $*
#hiegrep ':\+$' 'Empty lines' $* #hiegrep ':\+$' 'Empty lines' $*
hiegrep ';;' 'double ;' $* hiegrep ';;' 'double ;' $*
hiegrep2 '\b_[a-zA-Z0-9_]{1,}' '__(asm|attribute)([^a-zA-Z0-9]|$)' 'reserved identifer' $* hiegrep2 '\b_[a-zA-Z0-9_]{1,}' '__(asm|attribute)([^a-zA-Z0-9]|$)' 'reserved identifer' $*
@@ -106,9 +106,9 @@ hiegrep ':\+ *{ *$' '{ should be on the same line as the related previous state




rm $TMP rm $TMP
for i in `$GREP -H '^+.*@param' $*| sed 's/^\([^:]*\):.*@param\(\[.*\]\|\) *\([a-zA-Z0-9_]*\) .*$/\1:\3/'` ; do
doxpar=`echo $i | sed 's/^.*:\(.*\)$/\1/'`
file=`echo $i | sed 's/^\([^:]*\):.*$/\1/'`
for i in $($GREP -H '^+.*@param' $*| sed 's/^\([^:]*\):.*@param\(\[.*\]\|\) *\([a-zA-Z0-9_]*\) .*$/\1:\3/') ; do
doxpar=$(echo $i | sed 's/^.*:\(.*\)$/\1/')
file=$(echo $i | sed 's/^\([^:]*\):.*$/\1/')
$GREP " *$doxpar *[),]" $file | $GREP -v '@param' >/dev/null || $GREP --color=always "@param *$doxpar" $file >>$TMP $GREP " *$doxpar *[),]" $file | $GREP -v '@param' >/dev/null || $GREP --color=always "@param *$doxpar" $file >>$TMP
done done
if test -e $TMP ; then if test -e $TMP ; then
@@ -121,11 +121,11 @@ cat $TMP


rm $TMP rm $TMP
for i in \ for i in \
`$EGREP -H '^\+ *'"$ERE_TYPES" $* |\
$($EGREP -H '^\+ *'"$ERE_TYPES" $* |\
$GREP -v '(' | $EGREP -v '\Wgoto\W' |\ $GREP -v '(' | $EGREP -v '\Wgoto\W' |\
xargs -d '\n' -n 1 |\ xargs -d '\n' -n 1 |\
$GREP -o '[* ][* ]*[a-zA-Z][0-9a-zA-Z_]* *[,;=]' |\ $GREP -o '[* ][* ]*[a-zA-Z][0-9a-zA-Z_]* *[,;=]' |\
sed 's/.[* ]*\([a-zA-Z][0-9a-zA-Z_]*\) *[,;=]/\1/'` \
sed 's/.[* ]*\([a-zA-Z][0-9a-zA-Z_]*\) *[,;=]/\1/') \
; do ; do
echo $i | $GREP '^NULL$' && continue echo $i | $GREP '^NULL$' && continue
$EGREP $i' *(\+|-|\*|/|\||&|%|)=[^=]' $* >/dev/null || echo "possibly never written:"$i >> $TMP $EGREP $i' *(\+|-|\*|/|\||&|%|)=[^=]' $* >/dev/null || echo "possibly never written:"$i >> $TMP


Loading…
Cancel
Save