From: teor <teor@torproject.org>
Date: Tue, 23 Apr 2019 02:31:14 +0000 (+1000)
Subject: Stop looking for scripts in the build directory during "make shellcheck"
X-Git-Tag: tor-0.4.0.5~6^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1788343affdec7ac73dbdf1c50b486f593a2d428;p=thirdparty%2Ftor.git

Stop looking for scripts in the build directory during "make shellcheck"

Fixes bug 30263; bugfix on 0.4.0.1-alpha.
---

diff --git a/Makefile.am b/Makefile.am
index d65c08f6bf..8bf2aaf910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -220,7 +220,7 @@ shellcheck:
 	if command -v shellcheck; then \
 	        find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \
 	        if [ -d "$(top_srcdir)/scripts/test" ]; then \
-                        shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_builddir)/scripts/test/coverage; \
+                        shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \
                 fi; \
 	fi
 
diff --git a/changes/bug30263 b/changes/bug30263
new file mode 100644
index 0000000000..ba81c1b8a1
--- /dev/null
+++ b/changes/bug30263
@@ -0,0 +1,3 @@
+  o Minor bugfixes (shellcheck):
+    - Stop looking for scripts in the build directory during
+      "make shellcheck". Fixes bug 30263; bugfix on 0.4.0.1-alpha.