X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=bin%2Fmo-install;h=f580d69e8962c1689b84056e57b22c7124d6cd92;hb=65ff89923436ec785ce2b35d26827aa95ce8c3ce;hp=60b4a0a5a4ed88feba0cb822bc850367a3a4d663;hpb=48ddb88464d338ba50032ed21b3fdbf12899cc03;p=eval.git

diff --git a/bin/mo-install b/bin/mo-install
index 60b4a0a..f580d69 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,30 @@ set -e
 make
 
 H=`pwd`
-cd $MO_ROOT
 
 # mo-eval home
+cd $MO_ROOT
+rm -rf eval
+mkdir eval
+chgrp $EVAL_GROUP eval
+chmod 550 eval
+cd eval
 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
+( cd $EVAL_USER ; bin/mo-create-testusers )
 
-# common
+# 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_USER ; bin/mo-create-public )