From 0a9d6e1db0d540c443e3110af2a5857c55b9bbcc Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Sun, 30 Oct 2011 17:47:21 -0700 Subject: [PATCH] Makefile/upload-tarballs: remove bash-ism in shell conditional The "[" command is defined to accept "=" as an is-equal test. Bash extends this to accept "==" too, but normal /bin/sh does not. I think this command was developed on a box where /bin/sh is bash, but on standard ubuntu boxes, /bin/sh is a smaller+faster non-Bash shell, and this gave "[: 1: X: unexpected operator" errors. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 009a3146..ac08c257 100644 --- a/Makefile +++ b/Makefile @@ -257,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 -- 2.37.2