ROBUST does support includes, so use them.

6 files changed, 6 insertions, 17 deletions

diff --git a/TODO.txt b/TODO.txt
index 8e71978..04bbdc5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,7 +1,6 @@
 Still to do -
 
 Clean up the configs.
-    Make robust support includes.
     Why do we have Include-Common, Include-modules, Include-osslEnable, Include-Architecture, Include-Storage, Include-*Cache ??????
         It only looks for "Include-".
     Maybe move bin/assets and bin/inventory out of tree as well?
diff --git a/bin/Robust.ini b/bin/Robust.ini
index 30e64be..4e92d1a 100644
--- a/bin/Robust.ini
+++ b/bin/Robust.ini
@@ -1,4 +1,9 @@
 
+[Includes]
+    ; Define your server specific constants in this file.
+    Include-Common = ../../config/config.ini
+
+
 ; * The startup section lists all the connectors to start up in this server
 ; * instance. This may be only one, or it may be the entire server suite.
 ; * Multiple connectors should be separated by commas.
diff --git a/example/config/config.ini b/example/config/config.ini
index 510c8b6..7efdb44 100644
--- a/example/config/config.ini
+++ b/example/config/config.ini
@@ -15,6 +15,7 @@
     AssetsPath = "../../AssetFiles"
     BackupPath = "../../backups"
     CachePath = "../../caches"
+    ConfigPath = "../../config"
     DbPath = "../../db"
     LogPath = "../../logs"
 
diff --git a/scripts/install/secure.sh b/scripts/install/secure.sh
index db73558..43ed679 100755
--- a/scripts/install/secure.sh
+++ b/scripts/install/secure.sh
@@ -12,7 +12,6 @@ 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/robust-include
 sudo chmod a+x ${OS_PATH}/current/scripts/show-console
 sudo chmod a+x ${OS_PATH}/current/scripts/start-sim
 
diff --git a/scripts/robust-include b/scripts/robust-include
deleted file mode 100755
index e427eb1..0000000
--- a/scripts/robust-include
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Silly script to get around the lack of includes in ROBUST.
-
-source common.sh
-getPrgDir
-
-# The problem here is that the > bit is executed as the user, not as opensim.
-cat ${PRGDIR}/../../config/config.ini ${PRGDIR}/../bin/Robust.ini >${PRGDIR}/../../config/Robust.ini
-chown -R ${OS_USER}:${OS_USER} ${PRGDIR}/../../config/Robust.ini
-chmod 600 ${PRGDIR}/../../config/Robust.ini
diff --git a/scripts/start-sim b/scripts/start-sim
index 774aa54..3966ac8 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -92,10 +92,6 @@ case $(basename $0) in
         if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ]
         then
             if [ "x$tgt" = "xROBUST" ]; then
-                pushd ${PRGDIR}/../scripts
-                $SUDO ./robust-include
-                popd
-                cmd="${cmd} -inifile=${PRGDIR}/../../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}"