From: Tomas Gavenciak <gavento@atrey.karlin.mff.cuni.cz>
Date: Wed, 21 May 2008 13:03:32 +0000 (+0200)
Subject: Sensible defaults for EVAL_USER, EVAL_GROUP and TEST_USER.
X-Git-Tag: python-dummy-working~181
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=77ea607d3756e358a35e669b3bc2236027d5bf1e;p=moe.git

Sensible defaults for EVAL_USER, EVAL_GROUP and TEST_USER.
---

diff --git a/eval/libeval.sh b/eval/libeval.sh
index 542b07d..852bca8 100644
--- a/eval/libeval.sh
+++ b/eval/libeval.sh
@@ -75,16 +75,22 @@ function override-vars
 function box-init
 {
 	pstart "Preparing sandbox... "
-	if [ -z "$TEST_USER" -o "$TEST_USER" == $EVAL_USER ] ; then
+
+	# Default values for user/group
+	EVAL_USER=${EVAL_USER:-$USER}
+	EVAL_GROUP=${EVAL_GROUP:-$GROUP}
+	TEST_USER=${TEST_USER:-$EVAL_USER}
+
+	if [ -z "$TEST_USER" -o "$TEST_USER" == "$EVAL_USER" ] ; then
 		pcont "running locally (INSECURE), "
-		TEST_USER=$EVAL_USER
-		BOXDIR=`pwd`/box
-		BOXCMD=bin/box
-		mkdir -p box
+		TEST_USER="$EVAL_USER"
+		BOXDIR=$HDIR/box
+		BOXCMD=$HDIR/bin/box
+		mkdir -p $BOXDIR
 	else
 		pcont "used account $TEST_USER, "
-		BOXDIR=$MO_ROOT/eval/$TEST_USER
-		BOXCMD=bin/box-$TEST_USER
+		BOXDIR=$HDIR/box
+		BOXCMD=$HDIR/bin/box-$TEST_USER
 	fi
 	[ -d $BOXDIR -a -f $BOXCMD ] || die "Sandbox set up incorrectly"
 	BOXCMD="$BOXCMD -c$BOXDIR"