From: Martin Mares <mj@ucw.cz>
Date: Sun, 10 Jun 2007 15:22:45 +0000 (+0200)
Subject: More fixes to installation scripts.
X-Git-Tag: python-dummy-working~367
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e94bb0f9c6473da7c8688443c6e013465948fb49;p=moe.git

More fixes to installation scripts.
---

diff --git a/bin/mo-create-contestants b/bin/mo-create-contestants
index f2dd8d2..3cc4445 100755
--- a/bin/mo-create-contestants
+++ b/bin/mo-create-contestants
@@ -15,7 +15,7 @@ for a in `cd $H && bin/mo-get-users` ; do
 	mkdir $a $a/$a
 	chown root.$a $a
 	chmod 750 $a
-	cp -a `find $H/template -type f -name ".*"` $a/$a/
+	cp -a `find $H/template -mindepth 1 -maxdepth 1` $a/$a/
 
 	if [ -n "$REMOTE_SUBMIT" ] ; then
 		M=$a/$a/.mo
diff --git a/bin/mo-create-public b/bin/mo-create-public
index deeca70..27889f5 100755
--- a/bin/mo-create-public
+++ b/bin/mo-create-public
@@ -9,7 +9,7 @@ H=`pwd`
 cd $MO_ROOT/public
 rm -rf bin submit
 
-sed 's/^TEST_USER=/#TEST_USER=/' <$H/config >config
+sed '/^\(TEST_USER\|MO_ROOT\)=/s/^/#/' <$H/config >config
 
 mkdir bin
 cp -a $H/public/[a-z]* bin/
@@ -18,11 +18,10 @@ for a in `cat $H/public/COPY` ; do
 done
 
 if [ -n "$REMOTE_SUBMIT" ] ; then
-	mkdir -p submit
 	cp $H/submit/{contest,remote-submit,remote-status} bin/
-	mkdir -p submit/lib/perl5/{MO,Sherlock}
-	cp $H/submit/MO/*.pm submit/lib/perl5/MO/
-	cp $H/submit/lib/perl5/Sherlock/Object.pm submit/lib/perl5/Sherlock/
+	mkdir -p lib/perl5/{MO,Sherlock}
+	cp $H/submit/MO/*.pm lib/perl5/MO/
+	cp $H/submit/lib/perl5/Sherlock/Object.pm lib/perl5/Sherlock/
 fi
 
 mkdir -p problems
diff --git a/config b/config
index 83cdd06..7b472e1 100644
--- a/config
+++ b/config
@@ -2,9 +2,7 @@
 # (c) 2001--2007 Martin Mares <mj@ucw.cz>
 
 # The root of the whole directory hierarchy
-if [ -z "$MO_ROOT" ] ; then
-	MO_ROOT=/mo
-fi
+MO_ROOT=/mo
 
 # User and group used by the evaluator itself
 EVAL_USER=mo-eval