From: Brian Warner <warner@lothar.com>
Date: Mon, 31 Oct 2011 00:47:21 +0000 (-0700)
Subject: Makefile/upload-tarballs: remove bash-ism in shell conditional
X-Git-Tag: allmydata-tahoe-1.9.0~7
X-Git-Url: https://git.rkrishnan.org/provisioning?a=commitdiff_plain;h=0a9d6e1db0d540c443e3110af2a5857c55b9bbcc;p=tahoe-lafs%2Ftahoe-lafs.git

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

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