Re-arrange the install script, and build OpenSim in it.

1 files changed, 18 insertions, 13 deletions

diff --git a/InstallItAll.sh b/InstallItAll.sh
index 89ad21b..27d68df 100755
--- a/InstallItAll.sh
+++ b/InstallItAll.sh
@@ -78,15 +78,6 @@ sudo ln -fs opensim-IG_$OSVER current
 
 cd current
 
-sudo chown -R $OS_USER:$OS_USER $OSPATH
-sudo chmod -R 775 $OSPATH
-sudo chmod -R a-x $OSPATH
-sudo chmod -R a+X $OSPATH
-sudo chmod -R g+w $OSPATH
-sudo chmod -R a+x $OSPATH/current/scripts/*.sh
-sudo chmod a+x $OSPATH/current/scripts/show-console
-sudo chmod a+x $OSPATH/current/scripts/start-sim
-
 for dir in AssetFiles backups caches config db logs
 do
     if [ ! -f ../$dir ]; then
@@ -96,16 +87,30 @@ do
     fi
 done
 
-sudo chmod ug+rwx  $OSPATH/config
-sudo chmod g+s     $OSPATH/config
-sudo chmod 600 $OSPATH/config/config.ini
-
 pushd config/ROBUST >/dev/null
 sudo ln -fs ../../current/scripts/common.sh common.sh
 sudo ln -fs ../../current/scripts/start-sim start-sim
 sudo ln -fs ../../current/scripts/start-sim stop-sim
 popd >/dev/null
 
+echo "Building OpenSim."
+./runprebuild.sh
+./nant-color
+
+echo "Securing OpenSim."
+sudo chown -R $OS_USER:$OS_USER $OSPATH
+sudo chmod -R 775 $OSPATH
+sudo chmod -R a-x $OSPATH
+sudo chmod -R a+X $OSPATH
+sudo chmod -R g+w $OSPATH
+sudo chmod -R a+x $OSPATH/current/scripts/*.sh
+sudo chmod a+x $OSPATH/current/scripts/show-console
+sudo chmod a+x $OSPATH/current/scripts/start-sim
+
+sudo chmod ug+rwx  $OSPATH/config
+sudo chmod g+s     $OSPATH/config
+sudo chmod 600 $OSPATH/config/config.ini
+
 sudo sed -i "s@MYSQL_HOST@${MYSQL_HOST}@g" config/config.ini
 sudo sed -i "s@MYSQL_DB@${MYSQL_DB}@g" config/config.ini
 sudo sed -i "s@MYSQL_USER@${MYSQL_USER}@g" config/config.ini