From 451e158895a5ea5e1064ba28ff35b0b93105ede7 Mon Sep 17 00:00:00 2001
From: onefang
Date: Wed, 24 Jul 2019 17:26:44 +1000
Subject: Make the installation more robust.

---
 InstallItAll.sh           | 5 +++--
 scripts/install/secure.sh | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/InstallItAll.sh b/InstallItAll.sh
index 15f7c03..3152476 100755
--- a/InstallItAll.sh
+++ b/InstallItAll.sh
@@ -51,8 +51,8 @@ echo "Setting up OpenSim users.  This next prompt asks for your MySQL root users
 # Otherwise you can't get in.  Yep, the -p seems to still be needed.
 sudo mysql -u root -p -h localhost << zzzzEOFzzz
 create database if not exists $MYSQL_DB;
-create user '$MYSQL_USER' identified by '$MYSQL_PASSWORD';
-create user '$MYSQL_USER'@localhost identified by '$MYSQL_PASSWORD';
+create user if not exists '$MYSQL_USER' identified by '$MYSQL_PASSWORD';
+create user if not exists '$MYSQL_USER'@localhost identified by '$MYSQL_PASSWORD';
 grant all on $MYSQL_DB.* to '$MYSQL_USER';
 grant all on $MYSQL_DB.* to '$MYSQL_USER'@localhost;
 FLUSH PRIVILEGES;
@@ -119,6 +119,7 @@ sudo chown -R ${USER}:${USER} ${OS_PATH} *
 
 
 cd scripts/install
+sudo chmod a+x secure.sh
 sudo ./secure.sh
 
 echo "Done installing OpenSim."
diff --git a/scripts/install/secure.sh b/scripts/install/secure.sh
index 43ed679..db73558 100755
--- a/scripts/install/secure.sh
+++ b/scripts/install/secure.sh
@@ -12,6 +12,7 @@ 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
 
-- 
cgit v1.1