Don't try running 'cvs co' more than 5 times, since it might be a local

problem as well.  Document NIGHTLY_SKIP_STEP=PATCH.  Update to the currently
running script.
This commit is contained in:
Marc Olzheim 2005-03-15 18:05:16 +00:00
parent c890dd759c
commit d8938a1605

View file

@ -8,6 +8,7 @@
# #
# REDIRECT - Redirect all output to a logfile # REDIRECT - Redirect all output to a logfile
# CHECKOUT - Fill the sandbox with a fresh cvs checkout # CHECKOUT - Fill the sandbox with a fresh cvs checkout
# PATCH - Apply the patches for this system (global + specific)
# BUILD - Build everything # BUILD - Build everything
# GENERATE - Generate a new world # GENERATE - Generate a new world
# SERVERSTART - Start the server # SERVERSTART - Start the server
@ -120,7 +121,7 @@ while ! cvs -z3 -d:ext:"${SFLOGIN}"@cvs.sourceforge.net:/cvsroot/empserver co em
do do
sleep "`expr 5 + ${RETR}`" sleep "`expr 5 + ${RETR}`"
RETR="`expr 1 + ${RETR}`" RETR="`expr 1 + ${RETR}`"
[ "${RETR}" -gt 100 ] && err "CVS Timeout after ${RETR} retres." [ "${RETR}" -gt 5 ] && err "CVS Timeout after ${RETR} retres."
done done
echo "Done (CVS)." echo "Done (CVS)."
echo "" echo ""
@ -438,7 +439,7 @@ EOF
echo "Turn 2 for player 1" echo "Turn 2 for player 1"
runfeed 1 1 << EOF runfeed 1 << EOF >/dev/null 2>&1
desi -3,-1 b desi -3,-1 b
mov i 1,-1 120 2,-2 mov i 1,-1 120 2,-2
mov i 1,-1 4 jh mov i 1,-1 4 jh
@ -501,13 +502,12 @@ EOF
echo "Run an update" echo "Run an update"
runfeed POGO peter << EOF runfeed POGO peter << EOF
power new
cen * ?own#0 cen * ?own#0
reso * ?own#0 reso * ?own#0
enable enable
force 1 force 1
disable disable
power new
repo *
EOF EOF
echo "Done (force)." echo "Done (force)."
echo "" echo ""