From 7e2f9683036dd78f9ac4897b55f07f6286008a37 Mon Sep 17 00:00:00 2001
From: cassiopc <cassiopc@gmail.com>
Date: Fri, 26 Oct 2012 16:34:47 +0200
Subject: bug fixed about score file name in updatescore.sh, and inclusion of
 installboca.sh update itself

---
 boca-1.5.2/tools/etc/icpc/installboca.sh |   5 +++++
 boca-1.5.2/tools/icpc.etc.tgz            | Bin 9493 -> 9525 bytes
 boca-1.5.2/tools/updatescore.sh          |   8 ++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/boca-1.5.2/tools/etc/icpc/installboca.sh b/boca-1.5.2/tools/etc/icpc/installboca.sh
index d1cb842..55d8d18 100755
--- a/boca-1.5.2/tools/etc/icpc/installboca.sh
+++ b/boca-1.5.2/tools/etc/icpc/installboca.sh
@@ -151,6 +151,11 @@ cp -f safeexec /usr/bin
 chmod 4555 /usr/bin/safeexec
 [ -d /bocajail/usr/bin ] && cp -a /usr/bin/safeexec /bocajail/usr/bin/
 
+if [ -f /etc/icpc/installboca.sh ]; then
+  cp $basedir/boca/tools/etc/icpc/installboca.sh /etc/icpc/installboca.sh
+  chmod 700 /etc/icpc/installboca.sh
+fi
+
 echo "=================================================="
 echo "=================== SERVER SETUP   ==============="
 echo "=================================================="
diff --git a/boca-1.5.2/tools/icpc.etc.tgz b/boca-1.5.2/tools/icpc.etc.tgz
index f537585..0e4380c 100644
Binary files a/boca-1.5.2/tools/icpc.etc.tgz and b/boca-1.5.2/tools/icpc.etc.tgz differ
diff --git a/boca-1.5.2/tools/updatescore.sh b/boca-1.5.2/tools/updatescore.sh
index fc3ea83..6cf9489 100755
--- a/boca-1.5.2/tools/updatescore.sh
+++ b/boca-1.5.2/tools/updatescore.sh
@@ -115,8 +115,12 @@ while /bin/true; do
 						chown $apacheuser.root "$fscore"
 						chmod 660 "$fscore"
 						bfscore=`basename $fscore`
-						mv "$fscore" "$privatedir/score_$bfscore"
-						echo "Score downloaded successfully into $privatedir/score_$bfscore"
+						hasscore=`echo $bfscore | cut -d'_' -f1`
+						if [ "$hasscore" != "score" ]; then
+							bfscore=score_$bfscore
+						fi
+						mv "$fscore" "$privatedir/$bfscore"
+						echo "Score downloaded successfully into $privatedir/$bfscore"
 					done
 				else
 					echo "Error: score file from $BOCASERVER is not a valid package"
-- 
cgit v1.2.3