From bea9508a266d6f85bdab7bab0e80bbfb7e60e1fb Mon Sep 17 00:00:00 2001
From: Igronemyk <igronemyk@gmail.com>
Date: Mon, 1 Jan 2018 17:14:15 +0800
Subject: [PATCH] fix: fix the wrong svn password (#9)

Due to historical reasons,the password for problem will be refresh by the web side after it created.So the svn password should use only one. And the last hotfix caused some strange problem. Fix it.
---
 install/bundle/install.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/install/bundle/install.sh b/install/bundle/install.sh
index 23a2df0..ae743bc 100644
--- a/install/bundle/install.sh
+++ b/install/bundle/install.sh
@@ -7,7 +7,6 @@ _database_password_=root
 _judger_socket_port_=2333
 _judger_socket_password_=$(genRandStr 10)
 _main_judger_password_=$(genRandStr 32)
-_svn_ourroot_password_=$(genRandStr 10)
 _svn_certroot_password_=$(genRandStr 32)
 
 getAptPackage(){
@@ -112,7 +111,7 @@ password-db = passwd
 EOD
 
 svnusr="our-root"
-svnpwd="$_svn_ourroot_password_"
+svnpwd="$_svn_certroot_password_"
 
 cat >\$path/conf/passwd <<EOD
 [users]
@@ -133,7 +132,7 @@ UOJEOF
 	cat >/var/svn/problem/post-commit.sh <<UOJEOF
 #!/bin/sh
 svnusr="our-root"
-svnpwd="$_svn_ourroot_password_"
+svnpwd="$_svn_certroot_password_"
 cd /var/svn/problem/\$1/cur/\$1
 svn update --username \$svnusr --password \$svnpwd
 chown www-data /var/svn/problem/\$1 -R
@@ -149,7 +148,7 @@ UOJEOF
 setWebConf(){
 	echo -e "\n\n==> Setting web files"
 	#Commit web source file
-	svn co svn://127.0.0.1/uoj --username root --password $_svn_certroot_password_ 
+	svn co svn://127.0.0.1/uoj --username root --password $_svn_certroot_password_
 	mv ../../uoj/1 uoj/1 && cd uoj
 	svn add 1 && svn ci -m "Installtion commit" --username root --password $_svn_certroot_password_
 	cd .. && rm uoj /var/www/uoj -r