[tor-commits] [tor/master] Stop looking for scripts in the build directory during "make shellcheck"

nickm at torproject.org nickm at torproject.org
Mon Apr 29 14:16:06 UTC 2019


commit 1788343affdec7ac73dbdf1c50b486f593a2d428
Author: teor <teor at torproject.org>
Date:   Tue Apr 23 12:31:14 2019 +1000

    Stop looking for scripts in the build directory during "make shellcheck"
    
    Fixes bug 30263; bugfix on 0.4.0.1-alpha.
---
 Makefile.am      | 2 +-
 changes/bug30263 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d65c08f6b..8bf2aaf91 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 000000000..ba81c1b8a
--- /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.





More information about the tor-commits mailing list