mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace backticks in shell scripts with S()

Browse Source
This commit is contained in:
Andrew Wood
2023-07-22 20:20:15 +01:00
parent 101294195b
commit a24342a072
27 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoconf/scripts/benchmark.sh
+3 -3
View File
@@ -5,10 +5,10 @@
# time, as suggested by Ville Herva <Ville.Herva@iki.fi>.
#
test_input=`mktemp /tmp/pvbench1XXXXXX`
strace_output=`mktemp /tmp/pvbench2XXXXXX`
test_input=$(mktemp /tmp/pvbench1XXXXXX)
strace_output=$(mktemp /tmp/pvbench2XXXXXX)
trap "rm -f ${test_input} ${strace_output}" 0
trap "rm -f ${test_input} ${strace_output}" EXIT
pv=${pv:-./pv}
test -x ${pv} || pv=pv
autoconf/scripts/depend.sh
+9 -9
View File
@@ -3,22 +3,22 @@
# Generate dependencies for a C source file.
#
CC=$1
CC="$1"
shift
file=$1
file="$1"
shift
stem=$1
stem="$1"
shift
srcdir=$1
abssrc=`echo $srcdir | sed ':1
srcdir="$1"
abssrc=$(echo "$srcdir" | sed ':1
s,^\./,,g
t1'`
t1')
shift
abssrc=`echo "$abssrc" | sed 's,\\.,\\\\.,g'`
srcdir=`echo "$srcdir" | sed 's,\\.,\\\\.,g'`
abssrc=$(echo "$abssrc" | sed 's,\\.,\\\\.,g')
srcdir=$(echo "$srcdir" | sed 's,\\.,\\\\.,g')
$CC -M -MG $* $file \
$CC -M -MG $* "$file" \
| sed -e 's, /[^ ]*,,g' -e "s,^.*\.o:,${stem}.d ${stem}.o:," \
-e '/^ \\$/d' -e 's/ \\$//' \
-e 's,'"$srcdir"'/,,g' -e 's,'"$abssrc"'/,,g' \
autoconf/scripts/index.sh
+26 -26
View File
@@ -35,14 +35,14 @@ html_safebr () {
| sed -e 's|&|\&amp;|g;s|<|\&lt;|g;s|>|\&gt;|g;s/$/<BR>/'
}
ALLFILES=`find . -name '*~' -prune -o -type f -name '*.c' \
-exec grep -FL '!NOINDEX' /dev/null '{}' ';'`
ALLFILES=$(find . -name '*~' -prune -o -type f -name '*.c' \
-exec grep -FL '!NOINDEX' /dev/null '{}' ';')
CTAGDATA=`echo "$ALLFILES" \
CTAGDATA=$(echo "$ALLFILES" \
| ctags -nRf- -L- --c-types=f \
| sed 's/ .\// /;s/;" .*$//'`
| sed 's/ .\// /;s/;" .*$//')
FILELIST=`echo "$CTAGDATA" | cut -d ' ' -f 2 | sort | uniq`
FILELIST=$(echo "$CTAGDATA" | cut -d ' ' -f 2 | sort | uniq)
echo '<HTML><HEAD>'
echo '<TITLE>Source Code Index</TITLE>'
@@ -63,25 +63,25 @@ echo '</UL></P>'
for FILE in $FILELIST; do
DIR=`dirname $FILE`
FUNCDEFS=`cproto -f1 -I. -Isrc/include -I$DIR $FILE 2>/dev/null \
| sed -n 's/^.*[ *]\([^ *(]*\)(.*$/\1/p'`
FILEHEAD="`sed -n -e \
DIR=$(dirname $FILE)
FUNCDEFS=$(cproto -f1 -I. -Isrc/include -I$DIR $FILE 2>/dev/null \
| sed -n 's/^.*[ *]\([^ *(]*\)(.*$/\1/p')
FILEHEAD="$(sed -n -e \
'1,/\*\//{/\/\*/,/\*\//{s/^[\/ *]//;s/^\*[\/]*//;p;};}' \
< $FILE`"
FILESHORTDESC=`echo "$FILEHEAD" | sed -n '1,/^ *$/{/^ *[^ ]*/p;}'`
FILELONGDESC=`echo "$FILEHEAD" | sed '1,/^ *$/d'`
< $FILE)"
FILESHORTDESC=$(echo "$FILEHEAD" | sed -n '1,/^ *$/{/^ *[^ ]*/p;}')
FILELONGDESC=$(echo "$FILEHEAD" | sed '1,/^ *$/d')
echo '<P><HR WIDTH="100%"></P>'
echo '<P><TABLE BORDER="0"><TR>'
echo '<TD VALIGN="TOP"><CODE CLASS="filename">'
echo '<A NAME="file-'"$FILE"'">'"$FILE"'</A></CODE></TD>'
echo '<TD VALIGN="TOP"> - </TD>'
echo '<TD VALIGN="TOP">'`html_safe "$FILESHORTDESC"`'</TD>'
echo '<TD VALIGN="TOP">'$(html_safe "$FILESHORTDESC")'</TD>'
echo '</TR></TABLE></P>'
echo '<P><SMALL>[<A HREF="'"$OFFS/$FILE"'">View File</A>]</SMALL></P>'
echo '<P><BLOCKQUOTE>'
echo "`html_safebr "$FILELONGDESC"`"
echo "$(html_safebr "$FILELONGDESC")"
echo '</BLOCKQUOTE></P>'
if [ -n "$FUNCDEFS" ]; then
@@ -110,17 +110,17 @@ echo '</UL></P>'
echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do
FUNCDEF=`sed -n "$LINENUM,/{/p" < $FILE \
FUNCDEF=$(sed -n "$LINENUM,/{/p" < $FILE \
| tr '\n' ' ' \
| tr -d '{'`
| tr -d '{')
LASTCOMLINE=`sed -n '1,'"$LINENUM"'{/\/\*/=;}' < $FILE | sed -n '$p'`
LASTCOMLINE=$(sed -n '1,'"$LINENUM"'{/\/\*/=;}' < $FILE | sed -n '$p')
[ -z "$LASTCOMLINE" ] && LASTCOMLINE=1
LASTENDFUNCLINE=`sed -n '1,'"$LINENUM"'{/}/=;}' < $FILE | sed -n '$p'`
LASTENDFUNCLINE=$(sed -n '1,'"$LINENUM"'{/}/=;}' < $FILE | sed -n '$p')
[ -z "$LASTENDFUNCLINE" ] && LASTENDFUNCLINE=1
FUNCHEAD="`sed -n -e \
FUNCHEAD="$(sed -n -e \
"$LASTCOMLINE,"'/\*\//{h;s/^[\/ *]//;s/^\*[\/]*//;p;x;/\*\//q;}' \
< $FILE`"
< $FILE)"
[ "$LASTCOMLINE" -le "$LASTENDFUNCLINE" ] && FUNCHEAD=""
echo '<P><HR WIDTH="100%"></P>'
@@ -131,10 +131,10 @@ echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do
echo "$FILE"'</A></CODE>]'
echo '</P>'
echo '<P><CODE CLASS="funcdef">'"`html_safe "$FUNCDEF"`"'</CODE></P>'
echo '<P><CODE CLASS="funcdef">'"$(html_safe "$FUNCDEF")"'</CODE></P>'
echo '<P><BLOCKQUOTE>'
echo "`html_safebr "$FUNCHEAD"`"
echo "$(html_safebr "$FUNCHEAD")"
echo '</BLOCKQUOTE></P>'
echo '<P ALIGN="RIGHT"><SMALL CLASS="navbar">['
@@ -147,10 +147,10 @@ echo '<H2><A NAME="todo">To Do Listing</A></H2>'
echo '<P><UL>'
for FILE in $FILELIST; do
TODOLINES=`sed -n \
TODOLINES=$(sed -n \
-e '/\/\*.*\*\//!{/\/\*/,/\*\//{/TODO:/{=;};};}' \
-e '/\/\*.*\*\//{/TODO:/{=;};}' \
< $FILE`
< $FILE)
[ -z "$TODOLINES" ] && continue
@@ -159,8 +159,8 @@ for FILE in $FILELIST; do
echo '<UL>'
for NUM in $TODOLINES; do
TODO=`sed -n "$NUM"'{s/^.*TODO://;s/\*\/.*$//;p;}' < $FILE`
echo "<LI>[<B>$NUM</B>] `html_safe "$TODO"`</LI>"
TODO=$(sed -n "$NUM"'{s/^.*TODO://;s/\*\/.*$//;p;}' < $FILE)
echo "<LI>[<B>$NUM</B>] $(html_safe "$TODO")</LI>"
done
echo '</UL></LI>'
autoconf/scripts/makemake.sh
+17 -17
View File
@@ -21,43 +21,43 @@ command -v which ggrep 2>/dev/null | grep /ggrep >/dev/null && GREP=ggrep
echo '# Automatically generated file listings' > $outlist
echo '#' >> $outlist
echo "# Creation time: `date`" >> $outlist
echo "# Creation time: $(date)" >> $outlist
echo >> $outlist
echo '# Automatically generated module linking rules' > $outlink
echo '#' >> $outlink
echo "# Creation time: `date`" >> $outlink
echo "# Creation time: $(date)" >> $outlink
echo >> $outlink
echo -n "Scanning for source files: "
allsrc=`$FIND src -type f -name "*.c" -print`
allobj=`echo $allsrc | tr ' ' '\n' | sed 's/\.c$/.o/'`
alldep=`echo $allsrc | tr ' ' '\n' | sed 's/\.c$/.d/'`
allsrc=$($FIND src -type f -name "*.c" -print)
allobj=$(echo $allsrc | tr ' ' '\n' | sed 's/\.c$/.o/')
alldep=$(echo $allsrc | tr ' ' '\n' | sed 's/\.c$/.d/')
echo `echo $allsrc | wc -w | tr -d ' '` found
echo $(echo $allsrc | wc -w | tr -d ' ') found
echo -n "Scanning for modules: "
modules=`$FIND src -type d -print \
modules=$($FIND src -type d -print \
| $GREP -v '^src$' \
| $GREP -v '/_' \
| $GREP -v '^src/include' \
| $GREP -v 'CVS' \
| $GREP -v '.svn' \
| while read DIR; do \
CONTENT=\$(/bin/ls -d \$DIR/* \
CONTENT=$(/bin/ls -d $DIR/* \
| $GREP -v '.po$' \
| $GREP -v '.gmo$' \
| $GREP -v '.mo$' \
| $GREP -v '.h$' \
| sed -n '$p'); \
[ -n "\$CONTENT" ] || continue; \
echo \$DIR; \
[ -n "$CONTENT" ] || continue; \
echo $DIR; \
done
`
)
echo up to `echo $modules | wc -w | tr -d ' '` found
echo up to $(echo $modules | wc -w | tr -d ' ') found
echo "Writing module linking rules"
@@ -71,19 +71,19 @@ for i in $modules; do
deps=""
for j in $i/*.c; do
[ -f $j ] || continue
newobj=`echo $j | sed -e 's@\.c$@.o@'`
newobj=$(echo $j | sed -e 's@\.c$@.o@')
deps="$deps $newobj"
done
for j in $i/*; do
[ -d "$j" ] || continue
[ `basename $j` = "CVS" ] && continue
[ `basename $j` = ".svn" ] && continue
CONTENT=`/bin/ls -d $j/* \
[ $(basename $j) = "CVS" ] && continue
[ $(basename $j) = ".svn" ] && continue
CONTENT=$(/bin/ls -d $j/* \
| $GREP -v '.po$' \
| $GREP -v '.gmo$' \
| $GREP -v '.mo$' \
| $GREP -v '.h$' \
| sed -n '$p'`
| sed -n '$p')
[ -n "$CONTENT" ] || continue
deps="$deps $j.o"
done
autoconf/scripts/po2table.sh
+1 -1
View File
@@ -25,7 +25,7 @@ struct msgtable_s *minigettext__gettable(char *lang)
EOF
for POFILE in $*; do
LANG=`basename "$POFILE" | sed 's/.po$//'`
LANG=$(basename "$POFILE" | sed 's/.po$//')
echo " if (strncmp(lang, \"$LANG\", 2) == 0) {"
echo " static struct msgtable_s data[] = {";
autoconf/scripts/run-test.sh
+7 -7
View File
@@ -13,23 +13,23 @@ TESTS="$*"
# Temporary working files
#
TMP1=`mktemp 2>/dev/null` || TMP1=.tmp1
TMP2=`mktemp 2>/dev/null` || TMP2=.tmp2
TMP3=`mktemp 2>/dev/null` || TMP3=.tmp3
TMP4=`mktemp 2>/dev/null` || TMP4=.tmp4
TMP1=$(mktemp 2>/dev/null) || TMP1=.tmp1
TMP2=$(mktemp 2>/dev/null) || TMP2=.tmp2
TMP3=$(mktemp 2>/dev/null) || TMP3=.tmp3
TMP4=$(mktemp 2>/dev/null) || TMP4=.tmp4
export PROG TMP1 TMP2 TMP3 TMP4 # variables used by test scripts
FAIL=0
test -n "$TESTS" || TESTS=`ls "$SRCDIR/tests" | sort -n`
test -n "$TESTS" || TESTS=$(ls "$SRCDIR/tests" | sort -n)
for SCRIPT in $TESTS; do
test -f "$SCRIPT" || SCRIPT="$SRCDIR/tests/$SCRIPT"
test -f "$SCRIPT" || SCRIPT=`ls "$SRCDIR/tests/$SCRIPT"*`
test -f "$SCRIPT" || SCRIPT=$(ls "$SRCDIR/tests/$SCRIPT"*)
test -f "$SCRIPT" || continue
echo `basename "$SCRIPT"`: " " | cut -b1-20 | sed 's/-/ - /' | tr "\n" ' '
echo $(basename "$SCRIPT"): " " | cut -b1-20 | sed 's/-/ - /' | tr "\n" ' '
STATUS=0
sh -e "$SCRIPT" || STATUS=1