X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Fmo-install;h=2c0e8bd6360bd6ba96cf9c1971ad25a209370b6d;hb=cb0f3c4002950c72b6192e45d66540a77eda0ebd;hp=60b4a0a5a4ed88feba0cb822bc850367a3a4d663;hpb=48ddb88464d338ba50032ed21b3fdbf12899cc03;p=moe.git

diff --git a/bin/mo-install b/bin/mo-install
index 60b4a0a..2c0e8bd 100755
--- a/bin/mo-install
+++ b/bin/mo-install
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 [ -f config ] || { echo "Missing config file, check cwd." ; exit 1 ; }
 set -e
@@ -6,46 +6,34 @@ set -e
 make
 
 H=`pwd`
+
+# The eval directory
 cd $MO_ROOT
+rm -rf eval
+mkdir eval
+chgrp $EVAL_GROUP eval
+chmod 755 eval
+cd eval
 
 # mo-eval home
-echo "Creating $EVAL_USER"
-rm -rf ./$EVAL_USER
-mkdir $EVAL_USER
-cd $EVAL_USER
-cp -a $H/* .
-mv bin/profile .profile
-chmod +x bin/*
-cd ..
-chown -R $EVAL_USER.$EVAL_GROUP $EVAL_USER
-chmod 700 $EVAL_USER
-
-# mo-test home
-for u in $TEST_USERS ; do
-	echo "Creating $u"
-	rm -rf ./$u
-	mkdir $u
-	chown $u.$EVAL_GROUP $u
-	chmod 770 $u
-	cp $EVAL_USER/bin/box $EVAL_USER/bin/box-$u
-	chown $u.$EVAL_GROUP $EVAL_USER/bin/box-$u
-	chmod 4550 $EVAL_USER/bin/box-$u
-	done
-
-# common
+bin/mo-create-eval
+
+# testusers
+( cd eval && bin/mo-create-testusers )
+
+# mo-submit home
+if [ -n "$REMOTE_SUBMIT" ] ; then
+	mkdir submit
+	chmod 750 submit
+	if [ -d ~/.ssh ] ; then echo "Copying SSH configuration from ~/.ssh" ; cp -a ~/.ssh submit/ ; fi
+	( cd $H && bin/mo-create-submit )
+fi
+
+# create public
+cd $MO_ROOT
 echo "Creating public"
 rm -rf public
 mkdir public
-cd public
-cp -a $H/bin $H/config $H/problems .
-cp -a $H/public/* bin/
-chmod +x bin/*
-cd ..
-chown -R $EVAL_USER.$EVAL_GROUP public
-chmod 755 public
-
-# SSH keys (FIXME)
-echo "Copying SSH keys"
-mkdir $EVAL_USER/.ssh
-cp ~mj/.ssh/authorized_keys $EVAL_USER/.ssh/
-chown -R $EVAL_USER $EVAL_USER/.ssh
+
+# populate public
+( cd eval/eval ; bin/mo-create-public )