[tor-commits] [tor/master] Makefile: Explicitly list the subdirectories that contain scripts

[nickm@xxxxxxxxxxxxxx]

commit d14573a62371fd6d21ed801bc89e2f3ebdb98b2b
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Fri Aug 30 22:25:14 2019 +1000

    Makefile: Explicitly list the subdirectories that contain scripts
    
    Part of 30967.
---
 Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5cc4305cb..25c6562c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,9 +239,10 @@ test: all
 	$(top_builddir)/src/test/test
 
 shellcheck:
-        # Only use shellcheck if it is present
+	# Only use shellcheck if shellcheck is installed
+	# Check the directories that contain scripts that we can fix
 	if command -v shellcheck; then \
-                find "$(top_srcdir)" -name "*.sh" -not -path "$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec shellcheck {} +; \
+                find "$(top_srcdir)" -name "*.sh" -path "$(top_srcdir)/contrib/*" -path "$(top_srcdir)/doc/*" -path "$(top_srcdir)/scripts/*" -path "$(top_srcdir)/src/*" -not -path "$(top_srcdir)/src/ext/*" -not -path "$(top_srcdir)/src/rust/registry/*" -exec shellcheck {} +; \
 	        if [ -d "$(top_srcdir)/scripts/test" ]; then \
                         shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \
                 fi; \



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits