From ab68a12e7311920c09ce1e55d82b88d1c11d5970 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 15 Feb 2017 21:36:10 +1000
Subject: Fix up the install script a bit.

---
 InstallItAll.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/InstallItAll.sh b/InstallItAll.sh
index 062f111..89ad21b 100755
--- a/InstallItAll.sh
+++ b/InstallItAll.sh
@@ -51,10 +51,11 @@ fi
 USER=$(whoami)
 
 echo "Installing software."
-sudo apt-get install mysql-server tmux mono-complete nant nunit uuid-runtime monit mc
+sudo apt-get install mysql-server tmux mono-complete mono-gmcs nant nunit uuid-runtime monit mc
 sudo /etc/init.d/mysql restart
 
 echo "Setting up mySQL."
+# "create user if not exists" doesn't exist until MySQL 5.7, so we have to put up with a warning, which we can ignore.
 mysql -u root -p -h localhost << zzzzEOFzzz
 create database if not exists $MYSQL_DB;
 create user $OS_USER identified by '$MYSQL_PASSWORD';
@@ -104,12 +105,6 @@ 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
-popd >/dev/null
 
 sudo sed -i "s@MYSQL_HOST@${MYSQL_HOST}@g" config/config.ini
 sudo sed -i "s@MYSQL_DB@${MYSQL_DB}@g" config/config.ini
@@ -123,3 +118,5 @@ sudo chown $USER /home/$OS_USER/.tmux.conf
 sudo chmod 644 /home/$OS_USER/.tmux.conf
 
 sudo scripts/fix_var_run.sh
+
+echo "Done setting up OpenSim."
-- 
cgit v1.1