diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-17 08:56:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-17 08:56:13 -0400 |
| commit | 93ca08d66c329eef9691afe6292b2e15246f5510 (patch) | |
| tree | 365103a043f83f69fe564c2fd4e919424919e783 | |
| parent | 52d386c9b0507b09d4c3adb3e0916c1e14f7efe5 (diff) | |
| parent | 86478be50f4364025310d2846d16d09c15962387 (diff) | |
| download | tor-93ca08d66c329eef9691afe6292b2e15246f5510.tar.gz tor-93ca08d66c329eef9691afe6292b2e15246f5510.zip | |
Merge branch 'ticket29533_squashed'
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | changes/ticket29533 | 3 | ||||
| -rwxr-xr-x | scripts/git/pre-push.git-hook | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 7a0d40d6a5..df30e0b59a 100644 --- 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 new file mode 100644 index 0000000000..27ef681218 --- /dev/null +++ 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 index 51b0c896c8..71abc9aa2b 100755 --- 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) |