commit 93ca08d66c329eef9691afe6292b2e15246f5510 parent 52d386c9b0507b09d4c3adb3e0916c1e14f7efe5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 17 Jun 2019 08:56:13 -0400 Merge branch 'ticket29533_squashed' Diffstat:
| M | Makefile.am | | | 11 | ++++++++++- |
| A | changes/ticket29533 | | | 3 | +++ |
| M | scripts/git/pre-push.git-hook | | | 1 | - |
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am @@ -224,10 +224,19 @@ test: all shellcheck: # Only use shellcheck if it is present if command -v shellcheck; then \ - find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \ + find "$(top_srcdir)" -name "*.sh" -not -path "$(top_srcdir)/src/ext/*" -exec shellcheck {} +; \ if [ -d "$(top_srcdir)/scripts/test" ]; then \ shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \ fi; \ + if [ -e "$(top_srcdir)/contrib/dirauth-tools/nagios-check-tor-authority-cert" ]; then \ + shellcheck "$(top_srcdir)/contrib/dirauth-tools/nagios-check-tor-authority-cert"; \ + fi; \ + if [ -e "$(top_srcdir)/contrib/client-tools/torify" ]; then \ + shellcheck "$(top_srcdir)/contrib/client-tools/torify"; \ + fi; \ + if [ -d "$(top_srcdir)/scripts/git" ]; then \ + shellcheck $(top_srcdir)/scripts/git/*.git-hook; \ + fi; \ fi check-local: check-spaces check-changes check-includes check-best-practices shellcheck diff --git a/changes/ticket29533 b/changes/ticket29533 @@ -0,0 +1,3 @@ + o Testing: + - Run shellcheck for all non-third-party shell scripts that are shipped + with Tor. Closes ticket 29533. diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook @@ -35,7 +35,6 @@ if [ -e scripts/maint/practracker/practracker.py ]; then fi remote="$1" -remote_loc="$2" remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1)