tests: Run through shellcheck (#134)

Signed-off-by: Rosen Penev <rosenp@gmail.com>

1 files changed, 28 insertions, 28 deletions

diff --git a/test/test_flac.sh b/test/test_flac.sh
index 6ecd0f66..3e5f982e 100755
--- a/test/test_flac.sh
+++ b/test/test_flac.sh
@@ -25,16 +25,16 @@ export LANG=C LC_ALL=C
 
 dddie="die ERROR: creating files with dd"
 
-PATH=`pwd`/../src/flac:$PATH
-PATH=`pwd`/../src/metaflac:$PATH
-PATH=`pwd`/../src/test_streams:$PATH
-PATH=`pwd`/../objs/$BUILD/bin:$PATH
+PATH="$(pwd)/../src/flac:$PATH"
+PATH="$(pwd)/../src/metaflac:$PATH"
+PATH="$(pwd)/../src/test_streams:$PATH"
+PATH="$(pwd)/../objs/$BUILD/bin:$PATH"
 
 flac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
 
 run_flac ()
 {
-	if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
+	if [ "$FLAC__TEST_WITH_VALGRIND" = yes ] ; then
 		echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_flac.valgrind.log
 		valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac${EXE} $TOTALLY_SILENT --no-error-on-compression-fail $* 4>>test_flac.valgrind.log
 	else
@@ -44,7 +44,7 @@ run_flac ()
 
 run_metaflac ()
 {
-	if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
+	if [ "$FLAC__TEST_WITH_VALGRIND" = yes ] ; then
 		echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_flac.valgrind.log
 		valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac${EXE} $* 4>>test_flac.valgrind.log
 	else
@@ -54,7 +54,7 @@ run_metaflac ()
 
 md5cmp ()
 {
-	n=`( [ -f "$1" ] && [ -f "$2" ] && metaflac${EXE} --show-md5sum --no-filename "$1" "$2" 2>/dev/null || exit 1 ) | uniq | wc -l`
+	n=$( ( [ -f "$1" ] && [ -f "$2" ] && metaflac${EXE} --show-md5sum --no-filename "$1" "$2" 2>/dev/null || exit 1 ) | uniq | wc -l)
 	[ "$n" != "" ] && [ $n = 1 ]
 }
 
@@ -154,9 +154,9 @@ rt_test_raw ()
 {
 	f="$1"
 	extra="$2"
-	channels=`echo $f | awk -F- '{print $2}'`
-	bps=`echo $f | awk -F- '{print $3}'`
-	sign=`echo $f | awk -F- '{print $4}'`
+	channels="$(echo $f | awk -F- '{print $2}')"
+	bps="$(echo $f | awk -F- '{print $3}')"
+	sign="$(echo $f | awk -F- '{print $4}')"
 
 	echo $ECHO_N "round-trip test ($f) encode... " $ECHO_C
 	run_flac --force --verify --force-raw-format --endian=little --sign=$sign --sample-rate=44100 --bps=$bps --channels=$channels --no-padding --lax -o rt.flac $extra $f || die "ERROR"
@@ -400,7 +400,7 @@ test_skip_until ()
 		dopt="$wav_dopt"
 	fi
 
-	if ( [ $in_fmt = flac ] || [ $in_fmt = ogg ] ) && ( [ $out_fmt = flac ] || [ $out_fmt = ogg ] ) ; then
+	if [ $in_fmt = flac -o $in_fmt = ogg ] && [ $out_fmt = flac -o $out_fmt = ogg ]; then
 		CMP=md5cmp
 	else
 		CMP=cmp
@@ -690,7 +690,7 @@ echo "testing seek extremes:"
 run_flac --verify --force --no-padding --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 noise.raw || die "ERROR generating FLAC file"
 
 if [ $is_win = no ] ; then
-	total_noise_cdda_samples=`run_metaflac --show-total-samples noise.flac`
+	total_noise_cdda_samples="$(run_metaflac --show-total-samples noise.flac)"
 	[ $? = 0 ] || die "ERROR getting total sample count from noise.flac"
 else
 	# some flavors of cygwin don't seem to treat the \x0d as a word
@@ -704,7 +704,7 @@ run_flac $wav_dopt --skip=0 -o z.wav noise.flac || die "ERROR decoding FLAC file
 echo OK
 
 for delta in 2 1 ; do
-	n=`expr $total_noise_cdda_samples - $delta`
+	n=$((total_noise_cdda_samples - delta))
 	echo $ECHO_N "testing --skip=$n... " $ECHO_C
 	run_flac $wav_dopt --skip=$n -o z.wav noise.flac || die "ERROR decoding FLAC file noise.flac"
 	echo OK
@@ -719,7 +719,7 @@ rm noise.flac z.wav
 #@@@ cat will not work on old cygwin, need to fix
 if [ $is_win = no ] ; then
 	echo $ECHO_N "testing --input-size=50 --skip=10... " $ECHO_C
-	cat 50c.raw | run_flac $raw_eopt --input-size=50 --skip=10 -o z50c.skip10.flac - || die "ERROR generating FLAC file"
+	run_flac $raw_eopt --input-size=50 --skip=10 -o z50c.skip10.flac - < 50c.raw || die "ERROR generating FLAC file"
 	run_flac $raw_dopt -o z50c.skip10.raw z50c.skip10.flac || die "ERROR decoding FLAC file"
 	cmp 50c.skip10.raw z50c.skip10.raw || die "ERROR: file mismatch for --input-size=50 --skip=10"
 	rm -f z50c.skip10.raw z50c.skip10.flac
@@ -802,7 +802,7 @@ test_cue ()
 		dopt="$wav_dopt"
 	fi
 
-	if ( [ $in_fmt = flac ] || [ $in_fmt = ogg ] ) && ( [ $out_fmt = flac ] || [ $out_fmt = ogg ] ) ; then
+	if [ $in_fmt = flac -o $in_fmt = ogg ] && [ $out_fmt = flac -o $out_fmt = ogg ]; then
 		CMP=md5cmp
 	else
 		CMP=cmp
@@ -970,7 +970,7 @@ if [ $is_win = yes ] ; then
 	run_flac $raw_eopt noise.raw -o fixup.flac || die "ERROR generating FLAC file"
 	run_metaflac --set-total-samples=0 fixup.flac 2> /dev/null
 else
-	cat noise.raw | run_flac $raw_eopt - -c > fixup.flac || die "ERROR generating FLAC file"
+	run_flac $raw_eopt - -c < noise.raw > fixup.flac || die "ERROR generating FLAC file"
 fi
 
 echo $ECHO_N "decode... " $ECHO_C
@@ -995,7 +995,7 @@ if [ $is_win = yes ] ; then
 	run_flac $raw_eopt noise.raw -o fixup.flac || die "ERROR generating FLAC file"
 	run_metaflac --set-total-samples=0 fixup.flac 2> /dev/null
 else
-	cat noise.raw | run_flac $raw_eopt - -c > fixup.flac || die "ERROR generating FLAC file"
+	run_flac $raw_eopt - -c < noise.raw > fixup.flac || die "ERROR generating FLAC file"
 fi
 
 echo $ECHO_N "decode... " $ECHO_C
@@ -1015,7 +1015,7 @@ rm -f noise.aiff fixup.aiff fixup.flac
 echo "Generating multiple input files from noise..."
 multifile_format_decode="--endian=big --sign=signed"
 multifile_format_encode="$multifile_format_decode --sample-rate=44100 --bps=16 --channels=2 --no-padding"
-short_noise_cdda_samples=`expr $total_noise_cdda_samples / 8`
+short_noise_cdda_samples=$((total_noise_cdda_samples / 8))
 run_flac --verify --force --force-raw-format $multifile_format_encode --until=$short_noise_cdda_samples -o shortnoise.flac noise.raw || die "ERROR generating FLAC file"
 run_flac --decode --force shortnoise.flac -o shortnoise.raw --force-raw-format $multifile_format_decode || die "ERROR generating RAW file"
 run_flac --decode --force shortnoise.flac || die "ERROR generating WAVE file"
@@ -1037,17 +1037,17 @@ cp shortnoise.raw file1.raw
 cp shortnoise.raw file2.raw
 rm -f shortnoise.raw
 # create authoritative sector-aligned files for comparison
-file0_samples=`expr \( $short_noise_cdda_samples / 588 \) \* 588`
-file0_remainder=`expr $short_noise_cdda_samples - $file0_samples`
-file1_samples=`expr \( \( $file0_remainder + $short_noise_cdda_samples \) / 588 \) \* 588`
-file1_remainder=`expr $file0_remainder + $short_noise_cdda_samples - $file1_samples`
-file1_samples=`expr $file1_samples - $file0_remainder`
-file2_samples=`expr \( \( $file1_remainder + $short_noise_cdda_samples \) / 588 \) \* 588`
-file2_remainder=`expr $file1_remainder + $short_noise_cdda_samples - $file2_samples`
-file2_samples=`expr $file2_samples - $file1_remainder`
+file0_samples=$(( (short_noise_cdda_samples / 588) * 588))
+file0_remainder=$((short_noise_cdda_samples - file0_samples))
+file1_samples=$(( ( ( file0_remainder + short_noise_cdda_samples ) / 588 ) * 588))
+file1_remainder=$((file0_remainder + short_noise_cdda_samples - file1_samples))
+file1_samples=$((file1_samples - file0_remainder))
+file2_samples=$(( ( ( file1_remainder + short_noise_cdda_samples ) / 588 ) * 588))
+file2_remainder=$(( file1_remainder + short_noise_cdda_samples - file2_samples))
+file2_samples=$((file2_samples - file1_remainder))
 if [ $file2_remainder != '0' ] ; then
-	file2_samples=`expr $file2_samples + $file2_remainder`
-	file2_remainder=`expr 588 - $file2_remainder`
+	file2_samples=$((file2_samples + file2_remainder))
+	file2_remainder=$((588 - file2_remainder))
 fi
 
 dd if=file0.raw ibs=4 count=$file0_samples of=file0s.raw 2>/dev/null || $dddie