mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge branch 'ticket29533_squashed'
This commit is contained in:
commit
93ca08d66c
11
Makefile.am
11
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
|
||||
|
3
changes/ticket29533
Normal file
3
changes/ticket29533
Normal file
@ -0,0 +1,3 @@
|
||||
o Testing:
|
||||
- Run shellcheck for all non-third-party shell scripts that are shipped
|
||||
with Tor. Closes ticket 29533.
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user