Various little clean ups.

1 files changed, 19 insertions, 17 deletions

diff --git a/InstallItAll.sh b/InstallItAll.sh
index ab1074d..124fd5a 100755
--- a/InstallItAll.sh
+++ b/InstallItAll.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-OSPATH="/opt/opensim_TEST"
+OSPATH="/opt/opensim"
 MYSQL_HOST="localhost"
 MYSQL_DB="InfiniteGrid"
 MYSQL_USER="opensim"
 OS_USER="opensim"
 
-OSVER="8.2.1"
+OSVER="0.8.2.1"
 
 
 # Figure out where we are, most of this mess is to troll through soft links.
@@ -51,21 +51,21 @@ fi
 USER=$(whoami)
 
 echo "Installing software."
-#sudo apt-get install mysql-server tmux mono-complete uuid-runtime monit mc
-#sudo /etc/init.d/mysql restart
+sudo apt-get install mysql-server tmux mono-complete nant nunit uuid-runtime monit mc
+sudo /etc/init.d/mysql restart
 
 echo "Setting up mySQL."
-#mysql -u root -p -h localhost << zzzzEOFzzz
-#create database if not exists '$MYSQL_DB';
-#create user '$OS_USER' identified by '$MYSQL_PASSWORD';
-#create user '$OS_USER'@'localhost' identified by '$MYSQL_PASSWORD';
-#grant all on $MYSQL_DB.* to '$OS_USER';
-#grant all on $MYSQL_DB.* to '$OS_USER'@'localhost';
-#FLUSH PRIVILEGES;
-#zzzzEOFzzz
+mysql -u root -p -h localhost << zzzzEOFzzz
+create database if not exists $MYSQL_DB;
+create user $OS_USER identified by '$MYSQL_PASSWORD';
+create user $OS_USER@localhost identified by '$MYSQL_PASSWORD';
+grant all on $MYSQL_DB.* to $OS_USER;
+grant all on $MYSQL_DB.* to $OS_USER@localhost;
+FLUSH PRIVILEGES;
+zzzzEOFzzz
 
 echo "Setting up OpenSim."
-sudo adduser --system --shell /bin/false --group $OS_USER
+sudo adduser --system --shell /bin/bash --group $OS_USER
 sudo addgroup $USER $OS_USER
 
 sudo rm -fr   $OSPATH/opensim-IG_*
@@ -85,9 +85,6 @@ 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  config
-sudo chmod g+s     config
-sudo chmod 600 config/config.ini
 
 for dir in AssetFiles backups caches config db logs
 do
@@ -96,11 +93,17 @@ do
     sudo ln -fs ../$dir $dir
 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
 pushd config/sim01 >/dev/null
+sudo ln -fs ../../current/scripts/common.sh common.sh
 sudo ln -fs ../../current/scripts/start-sim backup-sim
 sudo ln -fs ../../current/scripts/start-sim start-sim
 sudo ln -fs ../../current/scripts/start-sim stop-sim
@@ -118,4 +121,3 @@ sudo chown $USER /home/$OS_USER/.tmux.conf
 sudo chmod 644 /home/$OS_USER/.tmux.conf
 
 sudo scripts/fix_var_run.sh
-sudo cat scripts/opensim-crontab.txt | sudo crontab -u $OS_USER -