Makefile/upload-tarballs: remove bash-ism in shell conditional

[tahoe-lafs/tahoe-lafs.git] / Makefile

diff --git a/Makefile b/Makefile
index 47492e2ded23c586fcd2219742b1986937756812..ac08c2571d282f7ee30d4999fcdff53c7cb40740 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -121,12 +121,26 @@ upload-coverage:
        false
 endif
 
+code-checks: build version-and-path check-interfaces -find-trailing-spaces -check-umids pyflakes
+
+version-and-path:
+       $(TAHOE) --version-and-path
+
+check-interfaces:
+       $(TAHOE) @misc/coding_tools/check-interfaces.py 2>&1 |tee violations.txt
+       @echo
 
 pyflakes:
        $(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+       @echo
 
 check-umids:
        $(PYTHON) misc/coding_tools/check-umids.py `find $(SOURCES) -name '*.py'`
+       @echo
+
+-check-umids:
+       -$(PYTHON) misc/coding_tools/check-umids.py `find $(SOURCES) -name '*.py'`
+       @echo
 
 count-lines:
        @echo -n "files: "
@@ -213,6 +227,11 @@ clean:
 
 find-trailing-spaces:
        $(PYTHON) misc/coding_tools/find-trailing-spaces.py -r $(SOURCES)
+       @echo
+
+-find-trailing-spaces:
+       -$(PYTHON) misc/coding_tools/find-trailing-spaces.py -r $(SOURCES)
+       @echo
 
 # The test-desert-island target grabs the tahoe-deps tarball, unpacks it,
 # does a build, then asserts that the build did not try to download anything
@@ -220,7 +239,7 @@ find-trailing-spaces:
 # support/lib/ directory is gone.
 
 fetch-and-unpack-deps:
-       test -f tahoe-deps.tar.gz || wget http://tahoe-lafs.org/source/tahoe/deps/tahoe-deps.tar.gz
+       test -f tahoe-deps.tar.gz || wget https://tahoe-lafs.org/source/tahoe/deps/tahoe-deps.tar.gz
        rm -rf tahoe-deps
        tar xzf tahoe-deps.tar.gz
 
@@ -238,4 +257,4 @@ tarballs:
        $(PYTHON) setup.py sdist --sumo --formats=bztar,gztar,zip
 
 upload-tarballs:
-       @if [ "X${BB_BRANCH}" == "Xtrunk" ] || [ "X${BB_BRANCH}" == "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
+       @if [ "X${BB_BRANCH}" = "Xtrunk" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi