1 files changed, 83 insertions, 26 deletions

diff --git a/scripts/start-sim b/scripts/start-sim
index bd0815f..48c530a 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -4,14 +4,17 @@ source common.sh
 getPrgDir
 
 USER=$(whoami)
-console_name="OpenSim_console"
-tmux_command="tmux -S /var/run/opensim/opensim-tmux.socket"
+console_name="OpenSimSC"
+tmux_command="tmux -S ${PRGDIR}/../../caches/opensim-tmux.socket"
 tmux_session=${console_name}
 tmux_window="${tmux_command} select-window -t ${tmux_session}"
 tmux_send="${tmux_command} send-keys -t ${tmux_session}"
 bindir="${PRGDIR}/../bin"
 date=$(date '+%F_%T')
+all=""
+delay=45
 quiet=""
+waiting=""
 inventory=""
 
 function wait_for_text()
@@ -22,27 +25,77 @@ function wait_for_text()
     done
 }
 
-if [ $USER = "opensim" ]
+
+if [ $USER = "${OS_USER}" ]
 then
     SUDO=""
 else
-    SUDO="sudo -Hu opensim"
+    SUDO="sudo -Hu ${OS_USER}"
+fi
+
+if [ "$1" = "-a" ]
+then
+    all="-a"
+    shift 1
+fi
+
+if [ "$1" = "-d" ]
+then
+    delay=$2
+    shift 2
 fi
 
 if [ "$1" = "-q" ]
 then
-    quiet="true"
+    quiet="-q"
+    shift 1
+fi
+
+if [ "$1" = "-w" ]
+then
+    waiting="-w"
     shift 1
 fi
-   
+
 if [ "x$1" = "x" ]; then
     tgt=$(basename $(pwd))
+    # These checks are kludgy.
+    if [ "$tgt" = "scripts" ]; then
+        all="-a"
+        cd ${PRGDIR}/../../config/ROBUST
+        tgt="ROBUST"
+    fi
+    if [ "$tgt" = "bin" ]; then
+        uptime
+        wait_for_text "ROBUST" "INITIALIZATION COMPLETE FOR ROBUST"
+        if [ ! "x$all" = "x" ]
+        then
+            echo "Sleeping for $((${delay} / 2)) seconds."
+            sleep $((${delay} / 2))
+            for i in $(seq -w 1 99)
+            do
+                if [ -e "${PRGDIR}/../../config/sim${i}" ]
+                then
+                    uptime
+                    echo "Starting sim${i}."
+                    cd ${PRGDIR}/../../config/sim${i}; ./start-sim -w
+                    uptime
+                    # Sleep for a while, so that there is plenty of time to finish starting scripts and such,
+                    # and we are not keeping the computer very busy if there are lots of sims.
+                    echo "Sleeping for ${delay} seconds."
+                    sleep ${delay}
+                fi
+            done
+            uptime
+        fi
+        exit 0
+    fi
     num="$(echo ${tgt} | cut -c 4-)"
-elif [ -d "./$1" ]; then
+elif [ -d "$1" ]; then
     tgt=$1
-elif [ -d "./sim$1" ]; then
+elif [ -d "sim$1" ]; then
     num=$1
-    tgt="./sim${num}"
+    tgt="sim${num}"
 else
     tgt=$1
     inventory=$1
@@ -61,8 +114,8 @@ if ( ${tmux_command} -q list-sessions 2>/dev/null | grep -q ${console_name}: );
     true
 else
     # The sudo is only so that the session is owned by opensim, otherwise it's owned by whoever ran this script, which is a likely security hole.
-    # After the session is created, we rely on the /var/run/opensim directory to be group sticky, so that anyone in the opensim group can attach to the tmux socket.
-    $SUDO ${tmux_command} new-session -d -s ${console_name} -n "Server"
+    # After the session is created, we rely on the ${PRGDIR}/../../caches/ directory to be group sticky, so that anyone in the opensim group can attach to the tmux socket.
+    $SUDO ${tmux_command} new-session -d -s ${console_name} -n "ROBUST"
 fi
 
 
@@ -71,36 +124,37 @@ if [ "x$tgt" = "xROBUST" ]; then
     title="ROBUST"
 elif [ "x$inventory" = "x" ]; then
     exe="OpenSim"
-    # Grab the first Section line of the sims .xml file, cut it down to the name.
+    # Grab the first RegionName line of the sims .ini file, cut it down to the name.
     title=$(getSimName ${num})
 fi
 
 case $(basename $0) in 
     "start-sim")
-        cmd="mono ${exe}.exe -inidirectory=${tgt} "
+        cmd="mono ${exe}.exe -inidirectory=../../config/${tgt} "
 
         # Check if it's already running.
-        if [ -e /var/run/opensim/${tgt}.pid ]
+        if [ -e ${PRGDIR}/../../caches/${tgt}.pid ]
         then
             # Double check if it's REALLY running.
-            if [ "x$(ps -p $(cat /var/run/opensim/${tgt}.pid) --no-headers -o comm)" = "x" ]; then
-                $SUDO rm -f /var/run/opensim/${tgt}.pid
+            if [ "x$(ps -p $(cat ${PRGDIR}/../../caches/${tgt}.pid) --no-headers -o comm)" = "x" ]; then
+                $SUDO rm -f  ${PRGDIR}/../../caches/${tgt}.pid
             fi
         fi
         # Now see if it's really really running.  lol
-        if [ ! -e /var/run/opensim/${tgt}.pid ]
+        if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ]
         then
             if [ "x$tgt" = "xROBUST" ]; then
-# TODO - the problem here is that the > bit is executed as onefang, not as opensim.
-                $SUDO cat ../config/config.ini ../config/Robust.ini.template >../config/Robust.ini
-#               $SUDO chown -R opensim:opensim ../config/Robust.ini
-                chmod 640 ../config/Robust.ini
                 ${tmux_command} split-window -hp 50 -t "${tmux_session}:" "${cmd}"
             else
                 ${tmux_command} new-window -dn "${title}" -t "${tmux_session}:${num}" "${cmd}"
             fi
         fi
 
+        if [ ! "x$all" = "x" ]
+        then
+            ${tmux_send}:ROBUST.{left} "../scripts/start-sim -a -d ${delay}" Enter
+        fi
+
         if [ "x$quiet" = "x" ]
         then
             if [ "x$tgt" = "xROBUST" ]; then
@@ -108,7 +162,10 @@ case $(basename $0) in
             fi
         fi
 
-        ${tmux_send}:"${title}" Enter Enter Enter
+        if [ ! "x$waiting" = "x" ]
+        then
+            wait_for_text "${title}" "INITIALIZATION COMPLETE FOR ${title}"
+        fi
         ;;
 
     "backup-inventory")
@@ -124,7 +181,7 @@ case $(basename $0) in
         ;;
 
     "backup-sim")
-        if [ -e /var/run/opensim/${tgt}.pid ]; then
+        if [ -e ${PRGDIR}/../../caches/${tgt}.pid ]; then
             cd ${PRGDIR}
             $SUDO ${PRGDIR}/gitAR.sh o "${title}"
             sim=$(sanitize "${title}")
@@ -141,7 +198,7 @@ case $(basename $0) in
         ;;
 
     "stop-sim")
-        if [ -e /var/run/opensim/${tgt}.pid ]; then
+        if [ -e ${PRGDIR}/../../caches/${tgt}.pid ]; then
             ${tmux_send}:"${title}" "alert WARNING - Emergency shutdown in one minute!" Enter
             ${tmux_send}:"${title}" "alert WARNING - Emergency shutdown in one minute!" Enter
             sleep 30
@@ -150,9 +207,9 @@ case $(basename $0) in
             sleep 30
             ${tmux_send}:"${title}" "shutdown" Enter
             sleep 30
-            if [ -e /var/run/opensim/${tgt}.pid ]; then
+            if [ -e ${PRGDIR}/../../caches/${tgt}.pid ]; then
                 echo "Killing it with extreme prejudice!"
-                kill -TERM `cat /var/run/opensim/${tgt}.pid`
+                kill -TERM `cat ${PRGDIR}/../../caches/${tgt}.pid`
             fi
         else
             echo "Sim ${title} is not running, so not stopping."