Add [Region] .ini block.

For including actual region definition in the normal .ini stack.

Same as the usual Region.ini format, except we add a RegionName
parameter.

3 files changed, 10 insertions, 11 deletions

diff --git a/scripts/common.sh b/scripts/common.sh
index c5a86ab..9d985f2 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -42,11 +42,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/$(num2name $1)/*.ini | head -n 1 | cut -d '"' -f 2
 }
 
 
diff --git a/scripts/install/create_sim.sh b/scripts/install/create_sim.sh
index 08cedba..475c127 100755
--- a/scripts/install/create_sim.sh
+++ b/scripts/install/create_sim.sh
@@ -71,14 +71,13 @@ 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
+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_IP@${IP}@g" ThisSim.ini
+sed -i "s@SIM_INT_PORT@$(( ${PORT} + 1 ))@g" ThisSim.ini
+sed -i "s@SIM_URL@${URL}@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
diff --git a/scripts/start-sim b/scripts/start-sim
index 3c6370f..4bcc803 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -71,7 +71,7 @@ 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