MO-P: Public parts of /mo include templates

diff --git a/mop/admin/mo-create-public.sh b/mop/admin/mo-create-public.sh
index 184c2ae1ed5c4b02336fe7affef33e798941d8af..a03d46013d5575c5c64cc34ac95c1198a22f6b28 100644 (file)
--- a/mop/admin/mo-create-public.sh
+++ b/mop/admin/mo-create-public.sh
@@ -28,6 +28,3 @@ chmod +x bin/templater.pl
 cp -aL $M/project/templater templater
 
 mkdir -p problems
-
-chown -R root.root .
-chmod -R go=rX .

diff --git a/mop/admin/mo-upload-public.sh b/mop/admin/mo-upload-public.sh
index 60d5f79708b82054eb98b8c04b8a1158a1b9ba83..5a99999591777b3c93b76ad94ff637e4653abc61 100644 (file)
--- a/mop/admin/mo-upload-public.sh
+++ b/mop/admin/mo-upload-public.sh
@@ -5,6 +5,13 @@
 [ -f cf/mop ] || { echo "Missing config file, check cwd." ; exit 1 ; }
 set -e
 . cf/mop
-( cd $MO_ROOT && tar cavvf /export/public.tar.gz public)
+
+(
+       cd $MO_ROOT &&
+       chown -R root.root public templates &&
+       chmod -R go=rX public templates &&
+       tar cavvf /export/public.tar.gz public templates
+)
+
 # XXX: Beware of quoting!
-bex add -i upload-public -s 'Upload /mo/public' -e "cd $MO_ROOT && rm -rf public && tar xavvf /nfs/export/public.tar.gz" contest -g
+bex add -i upload-public -s 'Upload /mo/public' -e "cd $MO_ROOT && rm -rf public templates && tar xavvf /nfs/export/public.tar.gz" contest -g

diff --git a/mop/project/templater.pl b/mop/project/templater.pl
index c745cfd3340dde4b29f635d805943874c3192c48..9362a454aa0251e94b2ff800703389f676d9687c 100755 (executable)
--- a/mop/project/templater.pl
+++ b/mop/project/templater.pl
@@ -6,7 +6,7 @@ use Gtk2 -init;
 
 my ($where,$taskdir,$home)=('/mo/public/templater/','/mo/templates/',$ENV{'HOME'});
 my @tasks = map { s#.*/##; $_ } (glob "$taskdir/*");
-my $contestName = "MO-P";
+my $contestName = "CEOI";
 
 sub create_template($$$$) {
     my ($path,$task,$name,$ext)=@_;