nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0

Browse Source
This commit is contained in:
Nick Mathewson 2019-04-29 10:15:03 -04:00
commit 593d29920e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -220,7 +220,7 @@ shellcheck:
if command -v shellcheck; then \ if command -v shellcheck; then \
find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \ find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \
if [ -d "$(top_srcdir)/scripts/test" ]; then \ 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; \
fi fi

3
changes/bug30263 Normal file
View File

@ -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.