[tor-commits] [tor/maint-0.4.2] shellcheck: Start checking most scripts for errors

[teor at torproject.org]

commit 57baea701f8852b94d8ebc3fd8e70ccc998f5036
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 15:40:39 2019 +1000

    shellcheck: Start checking most scripts for errors
    
    This check was accidentally disabled by a bad find command.
    
    Fixes bug 32402; bugfix on 0.4.2.1-alpha.
    Obviously correct changes to already reviewed code.
---
 changes/bug32402                   | 3 +++
 scripts/maint/checkShellScripts.sh | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/changes/bug32402 b/changes/bug32402
new file mode 100644
index 000000000..0654389be
--- /dev/null
+++ b/changes/bug32402
@@ -0,0 +1,3 @@
+  o Minor bugfixes (shellcheck):
+    - Start checking most scripts for shellcheck errors again.
+      Fixes bug 32402; bugfix on 0.4.2.1-alpha.
diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh
index 318f0fb57..4c872c7ee 100755
--- a/scripts/maint/checkShellScripts.sh
+++ b/scripts/maint/checkShellScripts.sh
@@ -35,12 +35,8 @@ if [ ! -d "$TOPLEVEL/src" ]; then
 fi
 
 # Check *.sh scripts, but ignore the ones that we can't fix
-find "$TOPLEVEL" \
+find "$TOPLEVEL/contrib" "$TOPLEVEL/doc" "$TOPLEVEL/scripts" "$TOPLEVEL/src" \
     -name "*.sh" \
-    -path "$TOPLEVEL/contrib/*" \
-    -path "$TOPLEVEL/doc/*" \
-    -path "$TOPLEVEL/scripts/*" \
-    -path "$TOPLEVEL/src/*" \
     -not -path "$TOPLEVEL/src/ext/*" \
     -not -path "$TOPLEVEL/src/rust/registry/*" \
     -exec shellcheck {} +