Merge branch 'SledjChisl'

15 files changed, 299 insertions, 207 deletions

diff --git a/scripts/opensim-monit.conf b/example/config/ROBUST/opensim-monit.conf
index 7785056..adce46d 100644
--- a/scripts/opensim-monit.conf
+++ b/example/config/ROBUST/opensim-monit.conf
@@ -21,10 +21,10 @@
 #
 # Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l.
 #
-check process sim01 with pidfile /var/run/opensim/sim01.pid
-    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/sim01 && /opt/opensim/config/sim01/start-sim -q'"
+check process ROBUST with pidfile OS_PATH/caches/ROBUST.pid
+    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd OS_PATH/config/ROBUST && OS_PATH/config/ROBUST/start-sim -q'"
         as uid root and gid root
-    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/sim01 && /opt/opensim/config/sim01/stop-sim'" with timeout 600 seconds
+    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd OS_PATH/config/ROBUST && OS_PATH/config/ROBUST/stop-sim'" with timeout 600 seconds
     if cpu usage > 50% for 4 cycles then restart
 #    if 5 restarts within 5 cycles then timeout
 #    if failed url http://127.0.0.1:9005/jsonSimStats/
diff --git a/scripts/backup-inventories.sh b/scripts/backup-inventories.sh
index db4d7f4..e4e7158 100755
--- a/scripts/backup-inventories.sh
+++ b/scripts/backup-inventories.sh
@@ -9,7 +9,7 @@ while read -d ';' p; do
   k=$(echo ${p} | cut -d '=' -f 1)
   v=$(echo ${p} | cut -d '=' -f 2)
   creds[${k}]="${v}"
-done < <(grep ConnectionString ${PRGDIR}/../config/config.ini | cut -d '"' -f 2)
+done < <(grep ConnectionString ${PRGDIR}/../../config/config.ini | cut -d '"' -f 2)
 # The above seems the best way to get bash to let the creds assignments survive outside the loop.
 
 # Only backup those that have not logged on since their last backup, but returning prims from sims will bypass this check.
diff --git a/scripts/backup-sims.sh b/scripts/backup-sims.sh
index b14acca..06cb780 100755
--- a/scripts/backup-sims.sh
+++ b/scripts/backup-sims.sh
@@ -5,10 +5,9 @@ getPrgDir
 
 for i in $(seq -w 1 99)
 do
-    j=$(num2name ${i})
-    if [ -e "${PRGDIR}/../config/${j}" ]
+    if [ -e "${PRGDIR}/../../config/sim${i}" ]
     then
-        pushd ${PRGDIR}/../config/${j} >/dev/null
+        pushd ${PRGDIR}/../../config/sim${i} >/dev/null
         # Find out the size of the last backup, base our later sleep on that, but do it now before backup-sim packs it away.
         sizeSleep=`sleepPerSize o "$(getSimName ${i})"`
         ./backup-sim
diff --git a/scripts/common.sh b/scripts/common.sh
index 2ec19ce..6aeb8b5 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -1,5 +1,7 @@
 #!/bin/echo Don't run this file, it's for common functions."
 
+OS_PATH="/opt/opensim_SC"
+OS_USER="opensimsc"
 
 # Figure out where we are, most of this mess is to troll through soft links.
 # PRGDIR=$(getPrgDir)
@@ -26,9 +28,7 @@ getPrgDir()
 # name=$(num2name 1)
 num2name()
 {
-  # Using a string format, coz using a number format ends with an octal error, coz 08 isn't a valid octal number.
-  # Why isn't octal dead already?
-  printf 'sim%02s' "$1"
+  /usr/bin/printf 'sim%02d' "$1"
 }
 
 
@@ -40,11 +40,11 @@ sanitize()
 }
 
 
-# Grab the first Section line of the sims .xml file, cut it down to the name.
+# Grab the first Section line of the sims .ini file, cut it down to the name.
 # name=$(getSimName 1)
 getSimName()
 {
-    grep "<Section " ${PRGDIR}/../../config/$(num2name $1)/*.xml | head -n 1 | cut -d '"' -f 2
+    grep "RegionName" ${PRGDIR}/../../config/sim$1/*.ini | head -n 1 | cut -d '"' -f 2
 }
 
 
@@ -73,4 +73,3 @@ sleepPerSize()
     echo 200
   fi
 }
-
diff --git a/scripts/create_sim.sh b/scripts/create_sim.sh
deleted file mode 100755
index 0681067..0000000
--- a/scripts/create_sim.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-source common.sh
-getPrgDir
-
-NAME=$1
-LOCATION=$2
-URL=$3
-IP=$4
-SIZE=$5
-
-OSPATH="/opt/opensim"
-cd $OSPATH/config
-
-k=0
-for i in $(seq -w 1 99)
-do
-    j=$(num2name "$i")
-    if [ -e "$j" ]
-    then
-        k=$i
-    fi
-done
-
-if [ "x$NAME" = "x" ]
-then
-    NAME="No name sim $RANDOM"  # Should be unique per grid.
-    echo "WARNING setting the sim name to [$NAME], this may not be what you want."
-fi
-# Sanitize the name.  Not removing [ or ], couldn't get that to work, only important for Windows.
-sim=$(sanitize $NAME)
-
-if [ "x$LOCATION" = "x" ]
-then
-    LOCATION="$RANDOM,$RANDOM"  # again UNIQUE (i.e. ONLY ONE) per grid in THIS case!
-    echo "WARNING setting the Location to $LOCATION, this may not be what you want."
-fi
-
-if [ "x$IP" = "x" ]
-then
-                                # 0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP.
-    IP="0.0.0.0"
-    echo "WARNING setting the InternalAddress to $IP, this may not be what you want."
-#    echo "  0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP."
-# According to the OpenSim docs, 0.0.0.0 means to listen on all NICs the machine has, which should work fine.
-fi
-
-if [ "x$URL" = "x" ]
-then
-# Here we make use of an external IP finding service.  Careful, it may move.
-#    URL=$(wget -q http://automation.whatismyip.com/n09230945.asp -O -) # URL is best (without the HTTP://), but IP (e.g. 88.109.81.55) works too.
-    URL="SYSTEMIP"
-    echo "WARNING setting the ExternalHostName to $URL, this may not be what you want."
-fi
-
-if [ "x$SIZE" = "x" ]
-then
-    SIZE="256"
-fi
-
-# Wow, the hoops we have to jump through to avoid octal.
-if [ 9 -gt $k ]; then
-    NUM=$(printf '0%1s' $(( 10#$k + 1 )) )
-else
-    NUM=$(printf '%2s' $(( 10#$k + 1 )) )
-fi
-
-PORT=$(( 9005 + (10#$k * 5) ))  # 9002 is used for HTTP/UDP so START with port 9003! CAUTION Diva/D2 starts at port 9000.
-UUID=$(uuidgen)
-
-echo "Creating sim$NUM on port $PORT @ $LOCATION - $NAME."
-
-cp -r sim_skeleton sim$NUM
-
-cd sim$NUM
-mv My_sim.xml ${sim}.xml
-sed -i "s@SIM_NAME@$NAME@g" ${sim}.xml
-sed -i "s@SIM_UUID@$UUID@g" ${sim}.xml
-sed -i "s@SIM_POS@$LOCATION@g" ${sim}.xml
-sed -i "s@SIM_IP@$IP@g" ${sim}.xml
-sed -i "s@SIM_INT_PORT@$(( $PORT + 1 ))@g" ${sim}.xml
-sed -i "s@SIM_URL@$URL@g" ${sim}.xml
-sed -i "s@SIM_SIZE@$SIZE@g" ${sim}.xml
-
-ln -s ../../current/scripts/common.sh common.sh
-ln -s ../../current/scripts/start-sim start-sim
-cp -P start-sim backup-sim
-cp -P start-sim stop-sim
-
-sed -i "s@SIM_NUMBER@$NUM@g" ThisSim.ini
-sed -i "s@SIM_PORT@$PORT@g" ThisSim.ini
-
-sed -i "s@SIM_NUMBER@$NUM@g" opensim-monit.conf
-
-sudo chown -R opensim:opensim ..
-sudo chmod -R g+w ..
diff --git a/scripts/fix_var_run.sh b/scripts/fix_var_run.sh
deleted file mode 100755
index 97567cb..0000000
--- a/scripts/fix_var_run.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Create the opensim run dir.
-mkdir -p /var/run/opensim
-chown opensim:opensim /var/run/opensim
-chmod ug+rwx  /var/run/opensim
-chmod o-rwx  /var/run/opensim
-chmod g+s  /var/run/opensim
diff --git a/scripts/install/create_sim.sh b/scripts/install/create_sim.sh
new file mode 100755
index 0000000..b940315
--- /dev/null
+++ b/scripts/install/create_sim.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+source ../common.sh
+getPrgDir
+
+NAME=$1
+LOCATION=$2
+SIZE=$3
+
+cd ${OS_PATH}/config
+
+k=0
+for i in $(seq -w 1 99)
+do
+    if [ -e "sim$i" ]
+    then
+        k=$i
+    fi
+done
+
+if [ "x${NAME}" = "x" ]
+then
+    NAME="No name sim $RANDOM"  # Should be unique per grid.
+    echo "WARNING setting the sim name to [${NAME}], this may not be what you want."
+fi
+# Sanitize the name.  Not removing [ or ], couldn't get that to work, only important for Windows.
+sim=$(sanitize ${NAME})
+
+if [ "x${LOCATION}" = "x" ]
+then
+    LOCATION="$RANDOM,$RANDOM"  # again UNIQUE (i.e. ONLY ONE) per grid in THIS case!
+    echo "WARNING setting the Location to ${LOCATION}, this may not be what you want."
+fi
+
+if [ "x${SIZE}" = "x" ]
+then
+    SIZE="256"
+fi
+
+# Wow, the hoops we have to jump through to avoid octal.
+if [ 9 -gt $k ]; then
+    NUM=$(printf '0%1s' $(( 10#$k + 1 )) )
+else
+    NUM=$(printf '%2s' $(( 10#$k + 1 )) )
+fi
+
+PORT=$(( 9005 + (10#$k * 2) ))  # 9002 is used for HTTP/UDP so START with port 9003! CAUTION Diva/D2 starts at port 9000.
+UUID=$(uuidgen)
+
+echo "Creating sim${NUM} on port ${PORT} @ ${LOCATION} - ${NAME}."
+
+cp -r sim_skeleton sim${NUM}
+
+cd sim${NUM}
+sed -i "s@SIM_NAME@${NAME}@g" ThisSim.ini
+sed -i "s@SIM_UUID@${UUID}@g" ThisSim.ini
+sed -i "s@SIM_POS@${LOCATION}@g" ThisSim.ini
+sed -i "s@SIM_INT_PORT@$(( ${PORT} + 1 ))@g" ThisSim.ini
+sed -i "s@SIM_SIZE@${SIZE}@g" ThisSim.ini
+
+ln -s ../../current/scripts/common.sh common.sh
+ln -s ../../current/scripts/start-sim start-sim
+cp -P start-sim backup-sim
+cp -P start-sim stop-sim
+
+sed -i "s@SIM_NUMBER@${NUM}@g" ThisSim.ini
+sed -i "s@SIM_PORT@${PORT}@g" ThisSim.ini
+
+sed -i "s@OS_PATH@${OS_PATH}@g" opensim-monit.conf
+sed -i "s@SIM_NUMBER@${NUM}@g" opensim-monit.conf
+
+mv ThisSim.ini $(sanitize "${NAME}").ini
+
+sudo chown -R ${OS_USER}:${OS_USER} ..
+sudo chmod -R g+w ..
diff --git a/scripts/go_live.sh b/scripts/install/go_live.sh
index 21d7072..c5ce90e 100755
--- a/scripts/go_live.sh
+++ b/scripts/install/go_live.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OSPATH="/opt/opensim"
+source common.sh
 
 for i in $(seq 99)
 do
diff --git a/scripts/group_migrate.sql b/scripts/install/group_migrate.sql
index 6c15011..6c15011 100644
--- a/scripts/group_migrate.sql
+++ b/scripts/install/group_migrate.sql
diff --git a/config/ROBUST/opensim-monit.conf b/scripts/install/opensim-monit.conf
index 70190b9..409b69e 100644
--- a/config/ROBUST/opensim-monit.conf
+++ b/scripts/install/opensim-monit.conf
@@ -9,23 +9,16 @@
 # on ubuntu/debian, this is overridden by the CHECK_INTERVALS var in
 # /etc/default/monit .  the below assumes you've set it to 30 seconds.
 #
-# if process dies, will restart sim within 30 seconds.  if process
-# dies 5 times in as many tries, will stop trying and send email
-# alert.
-#
-# if SimFPS drops to 0 for 2 minutes, restart.
-#
-# if process CPU usage stays above 300% for 2 minutes, restart.
-#
 # see ../README for configuration instructions.
 #
 # Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l.
 #
-check process ROBUST with pidfile /var/run/opensim/ROBUST.pid
-    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/ROBUST && /opt/opensim/config/ROBUST/start-sim -q'"
+check process simSIM_NUMBER with pidfile /OS_PATH/caches/simSIM_NUMBER.pid
+    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /OS_PATH/config/simSIM_NUMBER && /OS_PATH/config/simSIM_NUMBER/start-sim -q'"
         as uid root and gid root
-    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/ROBUST && /opt/opensim/config/ROBUST/stop-sim'" with timeout 600 seconds
+    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /OS_PATH/config/simSIM_NUMBER && /OS_PATH/config/simSIM_NUMBER/stop-sim'" with timeout 600 seconds
     if cpu usage > 50% for 4 cycles then restart
+    if MEMORY usage > 10% for 4 cycles then restart
 #    if 5 restarts within 5 cycles then timeout
 #    if failed url http://127.0.0.1:9005/jsonSimStats/
 #        and content != '"SimFPS":0.0,' for 4 cycles
@@ -33,4 +26,4 @@ check process ROBUST with pidfile /var/run/opensim/ROBUST.pid
 #    if failed url http://127.0.0.1:9008/jsonSimStats/
 #        and content == '"SimFPS":' for 4 cycles
 #        then restart
-
+    depends on ROBUST
diff --git a/scripts/install/opensim.tmux.conf b/scripts/install/opensim.tmux.conf
new file mode 100644
index 0000000..84e0c21
--- /dev/null
+++ b/scripts/install/opensim.tmux.conf
@@ -0,0 +1,97 @@
+# Tmux has a habit of changing what these options are for each version, so this is a bit of a mess.
+
+# Screen compatibility, change the command key.  And rebind the prefix sending command.
+set-option -g prefix C-a
+unbind-key C-b
+bind-key C-a send-prefix
+
+# r reloads the configuration, handy
+bind r source-file ~/.tmux.conf
+
+bind R clear-history
+
+# More sane pane gain.  B-)
+unbind %        # Remove default binding since we’re replacing them.
+unbind '"'
+bind | split-window -h
+bind - split-window -v
+
+# set-options -g global, -s server, -w window, otherwise a session option.
+#   -a appends a string to the existing option.
+#   -u unsets an option.
+#   -o prevents setting an aption if it is already set.
+#   -q shut up info messages.
+
+# SESSION OPTIONS
+
+set-option -g bell-action any
+set-option -g bell-on-alert on
+
+# Not actually documented what the limit is, but there is one.
+set-option -g history-limit 100000
+
+# All this mouse stuff is unreliable in UTF8 mode.  At least on roxterm.
+# Also keep in mind the terminal specs mouse report limit of 256 characters, being less than my typical terminal width.
+# Hmm, still wont pass mouse through like the docs say they will.
+# Ah, mc needs "mc -x".  Though once again, watch that right edge on huge terminals.
+# These three wont work under Ubuntu 16.04.
+##set-option -g mouse-resize-pane on
+##set-option -g mouse-select-pane on
+##set-option -g mouse-select-window on
+# This wont work under Ubuntu 16.04.
+##set-option -g mode-mouse on           # on - mouse does copy mode stuff; copy-mode - mouse can't go into copy mode, but does stuff once in there; off - mouse is unmolested.
+# Instead do this (also defaults to turning on the above three mouse things) -
+set-option -g mouse on
+# Or this.  sigh
+#set-option -g mouse
+##set-option -g mouse-utf8 off          # Defaults to on.
+
+set-option -g set-remain-on-exit on
+
+# How to set the title of the terminal window.
+set-option -g set-titles on
+set-option -g set-titles-string '#W'    # Default is "#S:#I:#W - "#T""
+
+set-option -g status-interval 1         # Redraw status line every second, for the clock.
+set-option -g status-justify centre     # Window list in the middle.
+##set-option -g status-utf8 on
+
+#  Character pair    Replaced with
+   #(shell-command)  First line of the command's output
+   #[attributes]     Colour or attribute change
+   #H                Hostname of local host (not FDQN)
+   #h                Hostname of local host without the domain name
+   #F                Current window flag
+   #I                Current window index
+   #D                Current pane unique identifier
+   #P                Current pane index
+   #S                Session name
+   #T                Current pane title
+   #W                Current window name
+   ##                A literal ‘#’
+
+# Yes, my terminal really is bigger than 160 characters.
+set-option -g status-left-length 42
+#set-option -g status-left '[#H #S #F]'
+set-option -g status-left '#H [#S:#I.#P]#F'
+set-option -g status-right-length 64
+set-option -g status-right "%F #(uptime | cut -d ' ' -f 2-2,10-)"       # %F is ISO date, uptime starts with the current time, and ends with the load average.  B-)
+
+# Set window notifications
+set-option -g visual-activity on        # Show status message for activity in monitor-activity windows.
+#set-option -g visual-content on                # Show status message for content in monitor-content windows.  Based on a fnmatch(3) string.
+set-option -g visual-silence on         # Show status message for silence in monitor-silence windows.  Based on a set interval.
+
+set-option -gw alternate-screen off     # Don't save the original screen before starting tmux, may also allow use of the terminals original scrollback buffer.
+set-option -gw clock-mode-style 24      # We are using the uptime clock anyway, so this is pointless.
+
+# Highlight active window
+set-option -gw window-status-current-bg red
+set-option -gw window-status-current-format '[#I:#W]'
+set-option -gw window-status-format '[#I:#W]#F'
+
+# Set window notifications
+set-option -gw monitor-activity on      # Bell on activity.
+
+# We want 256 colours in our terminal.
+set-option -g default-terminal "screen-256color"
diff --git a/scripts/install/secure.sh b/scripts/install/secure.sh
new file mode 100755
index 0000000..95aae84
--- /dev/null
+++ b/scripts/install/secure.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+source ../common.sh
+
+echo "Securing OpenSim."
+sudo chmod 600 ${OS_PATH}/config/*.ini
+sudo chmod 600 ${OS_PATH}/config/ROBUST/*.ini
+sudo chown -R ${OS_USER}:${OS_USER} ${OS_PATH}
+sudo chmod -R 775 ${OS_PATH}
+sudo chmod -R a-x ${OS_PATH}
+sudo chmod -R a+X ${OS_PATH}
+sudo chmod -R g+w ${OS_PATH}
+sudo chmod -R a+x ${OS_PATH}/current/*.sh
+sudo chmod -R a+x ${OS_PATH}/current/scripts/*.sh
+sudo chmod -R a+x ${OS_PATH}/current/scripts/install/*.sh
+sudo chmod a+x ${OS_PATH}/current/scripts/show-console
+sudo chmod a+x ${OS_PATH}/current/scripts/start-sim
+
+sudo chmod ug+rwx  ${OS_PATH}/config
+sudo chmod g+s     ${OS_PATH}/config
+sudo chmod 600 ${OS_PATH}/config/*.ini
+sudo chmod 600 ${OS_PATH}/config/ROBUST/*.ini
+
+chmod ug+rwx  ${OS_PATH}/caches
+chmod o-rwx ${OS_PATH}/caches
+chmod g+s ${OS_PATH}/caches
diff --git a/scripts/opensim.tmux.conf b/scripts/opensim.tmux.conf
deleted file mode 100644
index ea342a2..0000000
--- a/scripts/opensim.tmux.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-# Tmux has a habit of changing what these options are for each version, so this is a bit of a mess.
-
-set-option -g prefix C-a
-unbind-key C-b
-bind-key C-a send-prefix
-
-# r reloads the configuration, handy
-bind r source-file ~/.tmux.conf
-
-unbind % # Remove default binding since we’re replacing them.
-bind | split-window -h
-bind - split-window -v
-
-set-option -g bell-action any
-set-option -g bell-on-alert on
-
-set-option -g history-limit 100000
-
-# These three wont work under Ubuntu 16.04.
-set-option -g mouse-resize-pane on
-set-option -g mouse-select-pane on
-set-option -g mouse-select-window on
-set-option -g mouse-utf8 on
-
-#set-option -g set-remain-on-exit on
-set-option -g set-titles on
-set-option -g set-titles-string '#W'
-
-set-option -g status-interval 1
-set-option -g status-justify centre
-set-option -g status-utf8 on
-
-set-option -g status-left-length 80
-set-option -g status-left '[#H #S #F]'
-set-option -g status-right-length 80
-set-option -g status-right '%F #(uptime)'<-----># &F is ISO date, uptime starts with the current time, and ends with the load average.  B-)
-
-set-option -g visual-activity on
-set-option -g visual-content on
-set-option -g visual-silence on
-
-set-option -gw clock-mode-style 24
-# This wont work under Ubuntu 16.04.
-set-option -gw mode-mouse on
-# Instead do this (also defaults to turning on the above three mouse things) -
-#set-option -gw mouse on
-
-# Highlight active window
-set-option -gw window-status-current-bg red
-
-# Set window notifications
-set-option -gw monitor-activity on
diff --git a/scripts/show-console b/scripts/show-console
index ddeba86..e7fb941 100755
--- a/scripts/show-console
+++ b/scripts/show-console
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-tmux -S /var/run/opensim/opensim-tmux.socket select-window -t "OpenSim_console" \; attach-session -t "OpenSim_console"
+tmux -S ../../caches/opensim-tmux.socket select-window -t "OpenSimSC" \; attach-session -t "OpenSimSC"
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."