Fix trailing whitespace

[empserver] / src / scripts / nightly / nightlybuild.sh

diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh
index d158d432fc5f4cdd872afa4bc5f2bccf4450097b..8f4f2d65f755208fc2bf3305e0ce44f5f86625aa 100755 (executable)
--- a/src/scripts/nightly/nightlybuild.sh
+++ b/src/scripts/nightly/nightlybuild.sh
@@ -227,6 +227,12 @@ do
                break
        fi
 
+       if [ ! -f emp4/etc/empire/schedule ]
+       then
+               warn "schedule file is missing"
+               break
+       fi
+
        if [ ! -f emp4/etc/empire/econfig ]
        then
                warn "econfig file is missing"
@@ -306,14 +312,19 @@ fi
                *)
 
        echo "Removing existing server.log and journal.log"
-       if [ -f "../var/empire/server.log" ] 
+       if [ -f "../var/empire/server.log" ]
        then
            rm "../var/empire/server.log"
        fi
-       if [ -f "../var/empire/journal.log" ] 
+       if [ -f "../var/empire/journal.log" ]
        then
            rm "../var/empire/journal.log"
        fi
+       echo "Removing existing schedule"
+       if [ -f "../etc/empire/schedule" ]
+       then
+           >../etc/empire/schedule
+       fi
        echo "Starting server with -d in the background"
        ./emp_server -R 1 -e ../etc/empire/econfig -d 2>/dev/null &
        PID="$!"
@@ -346,18 +357,11 @@ fi
                }
        echo "Done (newcap_script / empire)."
        echo ""
-       
+
        echo "TODO: Replace this with a real test script."
        echo "Just do some rudimentary testing for now."
        echo ""
 
-       echo "Prevent updates from happening without our consent."
-       runfeed POGO peter << EOF
-disable
-EOF
-       echo "Done (update stop)."
-       echo ""
-       
                        ;;
        esac
        #
@@ -448,9 +452,7 @@ power new
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
        echo "Done (force)."
        echo ""
@@ -507,9 +509,7 @@ power new
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
        echo "Done (force)."
        echo ""
@@ -549,7 +549,7 @@ EOF
        runfeed 8 << EOF
 cen *
 map #
-read y 
+read y
 exp c 0,0 50 gyyygh
 des -7,-3 )
 lost *
@@ -562,9 +562,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
        echo "Done (force)."
        echo ""
@@ -592,7 +590,7 @@ EOF
        runfeed 8 << EOF
 cen *
 map #
-read y 
+read y
 lost *
 EOF
        echo "Run an update"
@@ -602,9 +600,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
        echo "Done (force)."
        echo ""
@@ -626,9 +622,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
 
        echo "Done (force)."
@@ -711,9 +705,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
 
        echo "Done (force)."
@@ -789,9 +781,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
 
        echo "Done (force)."
@@ -848,9 +838,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
 
        echo "Done (force)."
@@ -904,9 +892,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
 
        echo "Done (force)."
@@ -985,9 +971,7 @@ report *
 cen * ?own#0
 comm * ?own#0
 reso * ?own#0
-enable
-force 1
-disable
+force
 EOF
 
        echo "Done (force)."
@@ -1049,10 +1033,10 @@ EOF
        echo "Done (kill)."
 cd "${BOXDIR}/${WORKDIR}/emp4/var/empire" || err "Could not cd to ${BOXDIR}/${WORKDIR}/emp4/var/empire"
        echo "-- Start Server Log --"
-       cat server.log 
+       cat server.log
        echo "-- End of Server Log --"
        echo "-- Start Journal Log --"
-       cat journal.log 
+       cat journal.log
        echo "-- End of Journal Log --"
        echo "Server stopped"
                                        ;;