summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-06 15:40:39 +1000
committerteor <teor@torproject.org>2019-11-06 15:49:50 +1000
commit57baea701f8852b94d8ebc3fd8e70ccc998f5036 (patch)
tree0d2b829956af644669984c7ad1bf4ca9e50dd353
parent76fd872db88782c6bce1b539e27ba1d1ab88cbdb (diff)
downloadtor-57baea701f8852b94d8ebc3fd8e70ccc998f5036.tar.gz
tor-57baea701f8852b94d8ebc3fd8e70ccc998f5036.zip
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.
-rw-r--r--changes/bug324023
-rwxr-xr-xscripts/maint/checkShellScripts.sh6
2 files changed, 4 insertions, 5 deletions
diff --git a/changes/bug32402 b/changes/bug32402
new file mode 100644
index 0000000000..0654389be3
--- /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 318f0fb577..4c872c7ee0 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 {} +