tor

commit 26539ec3ae01a33f0ab4ce59fa83355ebdf32470
parent 48b08f0592734085d88b7546e39d42f6606026d6
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 19 Nov 2018 08:45:41 -0500

Merge remote-tracking branch 'tor-github/pr/518'

Diffstat:
A
changes/ticket28008
 | 
3
+++
M
scripts/test/coverage
 | 
20
++++++++++----------

2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/changes/ticket28008 b/changes/ticket28008
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Fix shellcheck warnings in scripts/test/coverage. Resolves issue
+      28008.
diff --git a/scripts/test/coverage b/scripts/test/coverage
@@ -8,30 +8,30 @@
 dst=$1
 
 for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do
-    BN=`basename $fn`
-    DN=`dirname $fn`
-    F=`echo $BN | sed -e 's/\.c$//;'`
+    BN=$(basename "$fn")
+    DN=$(dirname "$fn")
+    F=$(echo "$BN" | sed -e 's/\.c$//;')
     GC="${BN}.gcov"
     # Figure out the object file names
-    ONS=`echo ${DN}/src_*-${F}.o`
+    ONS=$(echo "${DN}"/src_*-"${F}".o)
     ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o"
     # If the wildcard didn't expand, no files
     if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ]
     then
       for on in $ONS; do
         # We should have a gcno file
-        GCNO=`echo $on | sed -e 's/\.o$/\.gcno/;'`
-        if [ -e $GCNO ]
+        GCNO=$(echo "$on" | sed -e 's/\.o$/\.gcno/;')
+        if [ -e "$GCNO" ]
         then
           # No need to test for gcda, since gcov assumes no execution
           # if it's absent
-          rm -f $GC
-          gcov -o $on $fn
-          if [ -e $GC ]
+          rm -f "$GC"
+          gcov -o "$on" "$fn"
+          if [ -e "$GC" ]
           then
             if [ -d "$dst" ]
             then
-              mv $GC $dst/$GC
+              mv "$GC" "$dst"/"$GC"
             fi
           else
             echo "gcov -o $on $fn didn't make a .gcov file"