[tor-commits] [tor/master] Fix most instances of SC2086 warning

nickm at torproject.org nickm at torproject.org
Mon Nov 19 13:45:48 UTC 2018


commit 7c04b00e65d67a38f119f4d3e50e8a47236e202f
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Sun Nov 11 17:50:43 2018 +0200

    Fix most instances of SC2086 warning
---
 scripts/test/coverage | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/test/coverage b/scripts/test/coverage
index e611a4be1..180a2d6dc 100755
--- a/scripts/test/coverage
+++ b/scripts/test/coverage
@@ -8,9 +8,9 @@
 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)
@@ -20,18 +20,18 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do
     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"





More information about the tor-commits mailing list