From a24342a072ec5bc7bd3ed4c6e0517d9bc92dd338 Mon Sep 17 00:00:00 2001 From: Andrew Wood Date: Sat, 22 Jul 2023 20:20:15 +0100 Subject: [PATCH] Replace backticks in shell scripts with S() --- autoconf/scripts/benchmark.sh | 6 ++-- autoconf/scripts/depend.sh | 18 ++++++------ autoconf/scripts/index.sh | 52 +++++++++++++++++------------------ autoconf/scripts/makemake.sh | 34 +++++++++++------------ autoconf/scripts/po2table.sh | 2 +- autoconf/scripts/run-test.sh | 14 +++++----- tests/000-cat | 2 +- tests/001-interval | 2 +- tests/002-rate | 4 +-- tests/003-progress | 2 +- tests/004-timer | 2 +- tests/005a-eta | 2 +- tests/005b-fineta | 2 +- tests/006-ratecount | 2 +- tests/007-bytes | 2 +- tests/008-numeric | 6 ++-- tests/010-pipe | 4 +-- tests/011-cksum | 4 +-- tests/012-averagerate | 2 +- tests/013-1mboundary | 2 +- tests/014-1mboundary2 | 2 +- tests/015-cksumpipe | 6 ++-- tests/016-numeric-timer | 8 +++--- tests/017-numeric-bytes | 6 ++-- tests/018-remote-format | 6 ++-- tests/019-remote-cksum | 18 ++++++------ tests/020-stop-at-size | 4 +-- 27 files changed, 107 insertions(+), 107 deletions(-) diff --git a/autoconf/scripts/benchmark.sh b/autoconf/scripts/benchmark.sh index 37ef35d..5c94957 100755 --- a/autoconf/scripts/benchmark.sh +++ b/autoconf/scripts/benchmark.sh @@ -5,10 +5,10 @@ # time, as suggested by Ville Herva . # -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 diff --git a/autoconf/scripts/depend.sh b/autoconf/scripts/depend.sh index f17f81e..9df70bd 100755 --- a/autoconf/scripts/depend.sh +++ b/autoconf/scripts/depend.sh @@ -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' \ diff --git a/autoconf/scripts/index.sh b/autoconf/scripts/index.sh index b402546..0e0f067 100755 --- a/autoconf/scripts/index.sh +++ b/autoconf/scripts/index.sh @@ -35,14 +35,14 @@ html_safebr () { | sed -e 's|&|\&|g;s|<|\<|g;s|>|\>|g;s/$/
/' } -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 '' echo 'Source Code Index' @@ -63,25 +63,25 @@ echo '

' 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 '

' echo '

' echo '' echo '' - echo '' + echo '' echo '
' echo ''"$FILE"' - '`html_safe "$FILESHORTDESC"`''$(html_safe "$FILESHORTDESC")'

' echo '

[View File]

' echo '

' - echo "`html_safebr "$FILELONGDESC"`" + echo "$(html_safebr "$FILELONGDESC")" echo '

' if [ -n "$FUNCDEFS" ]; then @@ -110,17 +110,17 @@ echo '

' 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 '

' @@ -131,10 +131,10 @@ echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do echo "$FILE"']' echo '

' - echo '

'"`html_safe "$FUNCDEF"`"'

' + echo '

'"$(html_safe "$FUNCDEF")"'

' echo '

' - echo "`html_safebr "$FUNCHEAD"`" + echo "$(html_safebr "$FUNCHEAD")" echo '

' echo '

[' @@ -147,10 +147,10 @@ echo '

To Do Listing

' echo '

    ' 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 '
      ' for NUM in $TODOLINES; do - TODO=`sed -n "$NUM"'{s/^.*TODO://;s/\*\/.*$//;p;}' < $FILE` - echo "
    • [$NUM] `html_safe "$TODO"`
      • " + TODO=$(sed -n "$NUM"'{s/^.*TODO://;s/\*\/.*$//;p;}' < $FILE) + echo "
    • [$NUM] $(html_safe "$TODO")
      • " done echo '
    ' diff --git a/autoconf/scripts/makemake.sh b/autoconf/scripts/makemake.sh index 886f328..5bd967d 100755 --- a/autoconf/scripts/makemake.sh +++ b/autoconf/scripts/makemake.sh @@ -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 diff --git a/autoconf/scripts/po2table.sh b/autoconf/scripts/po2table.sh index fbfe7ae..05d02b1 100755 --- a/autoconf/scripts/po2table.sh +++ b/autoconf/scripts/po2table.sh @@ -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[] = {"; diff --git a/autoconf/scripts/run-test.sh b/autoconf/scripts/run-test.sh index e7d8d25..5baa66c 100755 --- a/autoconf/scripts/run-test.sh +++ b/autoconf/scripts/run-test.sh @@ -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 diff --git a/tests/000-cat b/tests/000-cat index 1b07549..068a270 100644 --- a/tests/000-cat +++ b/tests/000-cat @@ -2,7 +2,7 @@ # # Check that data can be just passed straight through. -VALUE=`echo TESTING | $PROG 2>/dev/null` || exit 1 +VALUE=$(echo TESTING | $PROG 2>/dev/null) || exit 1 test "$VALUE" = "TESTING" # EOF diff --git a/tests/001-interval b/tests/001-interval index 2903cb8..c24fdc2 100644 --- a/tests/001-interval +++ b/tests/001-interval @@ -6,7 +6,7 @@ sleep 1 | $PROG -f -i 0.1 >/dev/null 2>$TMP1 # There should be more than 6 lines of output. # -NUM=`tr '\r' '\n' < $TMP1 | wc -l | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | wc -l | tr -d ' ') test $NUM -gt 6 # EOF diff --git a/tests/002-rate b/tests/002-rate index 2609ce4..67ac07f 100644 --- a/tests/002-rate +++ b/tests/002-rate @@ -4,9 +4,9 @@ # Transfer 102 bytes at 100 bytes/sec. It should take at least 1 second. # -START=`date +%S` +START=$(date +%S) dd if=/dev/zero bs=102 count=1 2>/dev/null | $PROG -L 100 2>/dev/null | cat >/dev/null -END=`date +%S` +END=$(date +%S) test $START -ne $END diff --git a/tests/003-progress b/tests/003-progress index d6438f7..2ea8d3e 100644 --- a/tests/003-progress +++ b/tests/003-progress @@ -7,7 +7,7 @@ dd if=/dev/zero bs=100 count=1 2>/dev/null \ # There should be more than 2 different lines of output. # -NUM=`tr '\r' '\n' < $TMP1 | sort | uniq -u | wc -l | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | sort | uniq -u | wc -l | tr -d ' ') test $NUM -gt 2 # EOF diff --git a/tests/004-timer b/tests/004-timer index ab1c134..e370eaa 100644 --- a/tests/004-timer +++ b/tests/004-timer @@ -8,7 +8,7 @@ # Count the number of different timer values; it should be >1. # -NUM=`sort < $TMP1 | uniq -u | wc -l | tr -d ' '` +NUM=$(sort < $TMP1 | uniq -u | wc -l | tr -d ' ') test $NUM -gt 1 # EOF diff --git a/tests/005a-eta b/tests/005a-eta index 9dde5f1..5392425 100644 --- a/tests/005a-eta +++ b/tests/005a-eta @@ -7,7 +7,7 @@ dd if=/dev/zero bs=100 count=1 2>/dev/null \ # Count the number of different ETA values there have been. # -NUM=`tr '\r' '\n' < $TMP1 | tr -d ' ' | sed '/^$/d' | sort | uniq | wc -l | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | tr -d ' ' | sed '/^$/d' | sort | uniq | wc -l | tr -d ' ') # 3 or less - not OK, since it should have taken 4 seconds. # diff --git a/tests/005b-fineta b/tests/005b-fineta index 0e030b3..8c3221d 100644 --- a/tests/005b-fineta +++ b/tests/005b-fineta @@ -7,7 +7,7 @@ dd if=/dev/zero bs=100 count=1 2>/dev/null \ # Count the number of different ETA values there have been. # -NUM=`tr '\r' '\n' < $TMP1 | tr -d ' ' | sed '/^$/d' | sort | uniq | wc -l | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | tr -d ' ' | sed '/^$/d' | sort | uniq | wc -l | tr -d ' ') # There should be at least 1 line of output. # diff --git a/tests/006-ratecount b/tests/006-ratecount index 1d4ea86..5e3c448 100644 --- a/tests/006-ratecount +++ b/tests/006-ratecount @@ -11,7 +11,7 @@ # Count the number of different rates output. # -NUM=`tr '\r' '\n' < $TMP1 | sort | uniq -u | wc -l | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | sort | uniq -u | wc -l | tr -d ' ') # There should be more than 2 different rates counted (around 100 bytes/sec # for the each block, 0 bytes/sec for the gap in the middle, and around 50 diff --git a/tests/007-bytes b/tests/007-bytes index ca0cfc6..03fc482 100644 --- a/tests/007-bytes +++ b/tests/007-bytes @@ -4,7 +4,7 @@ dd if=/dev/zero bs=100 count=1 2>/dev/null \ | LANG=C $PROG -f -b >/dev/null 2>$TMP1 -NUM=`tr '\r' '\n' < $TMP1 | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | tr -d ' ') test "$NUM" = "100B" # EOF diff --git a/tests/008-numeric b/tests/008-numeric index baa44f2..656e3b8 100644 --- a/tests/008-numeric +++ b/tests/008-numeric @@ -11,8 +11,8 @@ dd if=/dev/zero bs=100 count=1 2>/dev/null \ # The number of output lines should be >8 and <13, and the final percentage # should be 100. # -test `wc -l < $TMP1` -gt 8 -test `wc -l < $TMP1` -lt 13 -test `sed -n '$p' < $TMP1` -eq 100 +test $(wc -l < $TMP1) -gt 8 +test $(wc -l < $TMP1) -lt 13 +test $(sed -n '$p' < $TMP1) -eq 100 # EOF diff --git a/tests/010-pipe b/tests/010-pipe index 8e569dd..99fbc3e 100644 --- a/tests/010-pipe +++ b/tests/010-pipe @@ -4,7 +4,7 @@ # We nead GNU head. On some platforms it is named ghead instead of head. HEAD=head -for p in `echo $PATH | tr ':' '\n'` +for p in $(echo $PATH | tr ':' '\n') do if test -x $p/ghead then @@ -17,7 +17,7 @@ done COUNT1=100000000 #COUNT2=`$PROG -B 100000 -q /dev/zero | $HEAD -c $COUNT1 | wc -c | tr -d ' '` # Remove \n to fix the test on AIX -COUNT2=`$PROG -B 100000 -q /dev/zero | $HEAD -c $COUNT1 | tr -d '\n' | wc -c | tr -d ' '` +COUNT2=$($PROG -B 100000 -q /dev/zero | $HEAD -c $COUNT1 | tr -d '\n' | wc -c | tr -d ' ') #echo "[$COUNT1] [$COUNT2]" diff --git a/tests/011-cksum b/tests/011-cksum index beb8443..49be101 100644 --- a/tests/011-cksum +++ b/tests/011-cksum @@ -11,12 +11,12 @@ set -e # generate some data dd if=/dev/urandom of=$TMP1 bs=1024 count=10240 2>/dev/null -CKSUM1=`cksum $TMP1 | awk '{print $1}'` +CKSUM1=$(cksum $TMP1 | awk '{print $1}') # read through pv and test afterwards $PROG -B 100000 -q $TMP1 > $TMP2 -CKSUM2=`cksum $TMP2 | awk '{print $1}'` +CKSUM2=$(cksum $TMP2 | awk '{print $1}') test "x$CKSUM1" = "x$CKSUM2" diff --git a/tests/012-averagerate b/tests/012-averagerate index 89b77be..8fb5e2f 100644 --- a/tests/012-averagerate +++ b/tests/012-averagerate @@ -14,7 +14,7 @@ # Count the number of rates output that are below 80. # -NUM=`tr '\r' '\n' < $TMP1 | tr -dc '0-9.\n' | sed '/^$/d' | awk '$1<80{print}' | wc -l | tr -d ' '` +NUM=$(tr '\r' '\n' < $TMP1 | tr -dc '0-9.\n' | sed '/^$/d' | awk '$1<80{print}' | wc -l | tr -d ' ') # Nearly all of the output rates should be above 80 since the average rate # will always be around 100 bytes per second, except for pauses. diff --git a/tests/013-1mboundary b/tests/013-1mboundary index 89e2523..fc68fb2 100644 --- a/tests/013-1mboundary +++ b/tests/013-1mboundary @@ -16,7 +16,7 @@ # Count how many different line lengths we've seen. # -NUM=`tr '\r' '\n' < $TMP1 | awk '{x=length($0);if(x>0)print length($0)}' | sort | uniq | wc -l` +NUM=$(tr '\r' '\n' < $TMP1 | awk '{x=length($0);if(x>0)print length($0)}' | sort | uniq | wc -l) # There should only be one length (not counting 0). # diff --git a/tests/014-1mboundary2 b/tests/014-1mboundary2 index 00738cc..8de6d1d 100644 --- a/tests/014-1mboundary2 +++ b/tests/014-1mboundary2 @@ -16,7 +16,7 @@ # Count how many different line lengths we've seen. # -NUM=`tr '\r' '\n' < $TMP1 | awk '{x=length($0);if(x>0)print length($0)}' | sort | uniq | wc -l` +NUM=$(tr '\r' '\n' < $TMP1 | awk '{x=length($0);if(x>0)print length($0)}' | sort | uniq | wc -l) # There should only be one length (not counting 0). # diff --git a/tests/015-cksumpipe b/tests/015-cksumpipe index 665d729..d676148 100644 --- a/tests/015-cksumpipe +++ b/tests/015-cksumpipe @@ -11,7 +11,7 @@ set -e # generate some data dd if=/dev/urandom of=$TMP1 bs=1024 count=10240 2>/dev/null -CKSUM1=`cksum $TMP1 | awk '{print $1}'` +CKSUM1=$(cksum $TMP1 | awk '{print $1}') # read through pv and test afterwards ( @@ -26,7 +26,7 @@ sleep 1 dd if=$TMP1 bs=1024 skip=2048 ) 2>/dev/null | $PROG -q -L 2M | cat > $TMP2 -CKSUM2=`cksum $TMP2 | awk '{print $1}'` +CKSUM2=$(cksum $TMP2 | awk '{print $1}') test "x$CKSUM1" = "x$CKSUM2" @@ -43,7 +43,7 @@ sleep 1 dd if=$TMP1 bs=1024 skip=2048 ) 2>/dev/null | $PROG -q -L 2M > $TMP2 -CKSUM2=`cksum $TMP2 | awk '{print $1}'` +CKSUM2=$(cksum $TMP2 | awk '{print $1}') test "x$CKSUM1" = "x$CKSUM2" diff --git a/tests/016-numeric-timer b/tests/016-numeric-timer index 2637778..9d8f08b 100644 --- a/tests/016-numeric-timer +++ b/tests/016-numeric-timer @@ -12,9 +12,9 @@ dd if=/dev/zero bs=100 count=1 2>/dev/null \ # different elapsed times should be at least 7. The last percentage should # be 100. # -test `wc -l < $TMP1` -gt 8 -test `wc -l < $TMP1` -lt 13 -test `tr , . < "$TMP1" | awk '{print int(10*$1)}' | sort -n | uniq | wc -l` -gt 7 -test `sed -n '$p' < $TMP1 | awk '{print $2}'` -eq 100 +test $(wc -l < $TMP1) -gt 8 +test $(wc -l < $TMP1) -lt 13 +test $(tr , . < "$TMP1" | awk '{print int(10*$1)}' | sort -n | uniq | wc -l) -gt 7 +test $(sed -n '$p' < $TMP1 | awk '{print $2}') -eq 100 # EOF diff --git a/tests/017-numeric-bytes b/tests/017-numeric-bytes index c0c32d1..9d4e6fd 100644 --- a/tests/017-numeric-bytes +++ b/tests/017-numeric-bytes @@ -12,8 +12,8 @@ dd if=/dev/zero bs=500 count=1 2>/dev/null \ # The number of output lines should be >8 and <13, and the final byte count # should be 500. # -test `wc -l < $TMP1` -gt 8 -test `wc -l < $TMP1` -lt 13 -test `sed -n '$p' < $TMP1` -eq 500 +test $(wc -l < $TMP1) -gt 8 +test $(wc -l < $TMP1) -lt 13 +test $(sed -n '$p' < $TMP1) -eq 500 # EOF diff --git a/tests/018-remote-format b/tests/018-remote-format index 6944f0d..f301ed2 100644 --- a/tests/018-remote-format +++ b/tests/018-remote-format @@ -18,15 +18,15 @@ dd if=/dev/zero of=$TMP1 bs=1024 count=10240 2>/dev/null ( sleep 1 -$PROG -R `cat $TMP4` -a +$PROG -R $(cat $TMP4) -a sleep 2 -$PROG -R `cat $TMP4` -L 10M +$PROG -R $(cat $TMP4) -L 10M ) & $PROG -L 2M -f -P $TMP4 $TMP1 > $TMP2 2>$TMP3 # Make sure there is more than one length of line (excluding blank lines). -line_lengths=`tr '\r' '\n' < "$TMP3" | awk '{print length($0)}' | grep -Fvx 0 | sort -n | uniq | wc -l` +line_lengths=$(tr '\r' '\n' < "$TMP3" | awk '{print length($0)}' | grep -Fvx 0 | sort -n | uniq | wc -l) test $line_lengths -gt 1 # EOF diff --git a/tests/019-remote-cksum b/tests/019-remote-cksum index b8e1184..c98999d 100644 --- a/tests/019-remote-cksum +++ b/tests/019-remote-cksum @@ -24,18 +24,18 @@ echo FAIL > $TMP3 set +e sleep 2 for x in 1 2 3; do - $PROG -R `cat $TMP4` -apterb || exit 1 + $PROG -R $(cat $TMP4) -apterb || exit 1 (usleep 200000 || sleep 1) 2>/dev/null - $PROG -R `cat $TMP4` -p || exit 1 + $PROG -R $(cat $TMP4) -p || exit 1 (usleep 200000 || sleep 1) 2>/dev/null - $PROG -R `cat $TMP4` -N "test" || exit 1 + $PROG -R $(cat $TMP4) -N "test" || exit 1 (usleep 200000 || sleep 1) 2>/dev/null - $PROG -R `cat $TMP4` -F "%e" || exit 1 + $PROG -R $(cat $TMP4) -F "%e" || exit 1 (usleep 200000 || sleep 1) 2>/dev/null - $PROG -R `cat $TMP4` -N "." || exit 1 + $PROG -R $(cat $TMP4) -N "." || exit 1 (usleep 200000 || sleep 1) 2>/dev/null done -$PROG -R `cat $TMP4` -L 10M +$PROG -R $(cat $TMP4) -L 10M echo OK > $TMP3 ) & @@ -43,12 +43,12 @@ echo OK > $TMP3 $PROG -L 100k -i 0.1 -f -P $TMP4 $TMP1 > $TMP2 2>/dev/null # Check our remote control calls ran OK. -BGSTATUS=`cat $TMP3` +BGSTATUS=$(cat $TMP3) test "x$BGSTATUS" = "xOK" # Check data integrity. -CKSUM1=`cksum $TMP1 | awk '{print $1}'` -CKSUM2=`cksum $TMP2 | awk '{print $1}'` +CKSUM1=$(cksum $TMP1 | awk '{print $1}') +CKSUM2=$(cksum $TMP2 | awk '{print $1}') test "x$CKSUM1" = "x$CKSUM2" # EOF diff --git a/tests/020-stop-at-size b/tests/020-stop-at-size index 95b90af..edfb6b5 100644 --- a/tests/020-stop-at-size +++ b/tests/020-stop-at-size @@ -13,12 +13,12 @@ dd if=/dev/urandom of=$TMP1 bs=1024 count=10 2>/dev/null # read through pv and test afterwards $PROG -S -s 5120 -q $TMP1 > $TMP2 -CKSUM2=`cksum $TMP2 | awk '{print $1}'` +CKSUM2=$(cksum $TMP2 | awk '{print $1}') # take the first 5120 bytes of TMP1 and cksum them rm -f $TMP2 dd if=$TMP1 of=$TMP2 bs=1024 count=5 2>/dev/null -CKSUM1=`cksum $TMP2 | awk '{print $1}'` +CKSUM1=$(cksum $TMP2 | awk '{print $1}') test "x$CKSUM1" = "x$CKSUM2"