From: Christian Bayle <cbayle@gmail.com>
Date: Mon, 18 Oct 2010 17:53:18 +0000 (+0000)
Subject: Setup a better ws/ dir
X-Git-Tag: v5.1~1131
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=0bb432929f61fc57ddf5a01d3941c3b22c98c0fe;ds=sidebyside

Setup a better ws/ dir
---

diff --git a/Makefile b/Makefile
index 6fb0bedded..7c0ffefbce 100644
--- a/Makefile
+++ b/Makefile
@@ -89,3 +89,7 @@ src/plugins/mediawiki/mediawiki-skin/FusionForge.php:
 
 %: src/plugins/mediawiki/mediawiki-skin/FusionForge.php
 	$(MAKE) -f Makefile.$(DIST) $@
+
+wslink:
+	@[ -d ~/public_html ] || mkdir ~/public_html
+	@[ -L ~/public_html/ws ] || ln -s $(CURDIR) ~/public_html/ws
diff --git a/Makefile.debian b/Makefile.debian
index dbe7bdd674..fce9369423 100644
--- a/Makefile.debian
+++ b/Makefile.debian
@@ -459,5 +459,3 @@ gnupgkey:
 	echo '%echo done' >> $(BOTKEY)
 	[ -d ~/.gnupg ] || gpg --batch --gen-key $(BOTKEY)
 
-wslink:
-	rm -f /var/www/ws; ln -s $(CURDIR) /var/www/ws
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index de848503ac..d4c9efb244 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -17,8 +17,9 @@ then
 	export VZTEMPLATE=debian-$DEBVERS-$ARCH-minimal
 	export VZPRIVATEDIR
 	export DIST
-	export SELENIUM_RC_URL=http://`hostname -f`/ws/reports
-	export FFORGE_DEB_REPO=http://`hostname -f`/ws/build/debian
+	export BASEDIR=${BASEDIR:-/`id -un`/ws}
+	export SELENIUM_RC_URL=http://`hostname -f`$BASEDIR/reports
+	export FFORGE_DEB_REPO=http://`hostname -f`$BASEDIR/build/debian
 	export HOST=debian6.local
 	export SELENIUM_RC_HOST=localhost
 	export USEVZCTL=true