diff options
-rwxr-xr-x | InstallItAll.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/InstallItAll.sh b/InstallItAll.sh index 27d68df..1efd0f5 100755 --- a/InstallItAll.sh +++ b/InstallItAll.sh | |||
@@ -54,7 +54,7 @@ echo "Installing software." | |||
54 | sudo apt-get install mysql-server tmux mono-complete mono-gmcs nant nunit uuid-runtime monit mc | 54 | sudo apt-get install mysql-server tmux mono-complete mono-gmcs nant nunit uuid-runtime monit mc |
55 | sudo /etc/init.d/mysql restart | 55 | sudo /etc/init.d/mysql restart |
56 | 56 | ||
57 | echo "Setting up mySQL." | 57 | echo "Setting up OpenSim users." |
58 | # "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. | 58 | # "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. |
59 | mysql -u root -p -h localhost << zzzzEOFzzz | 59 | mysql -u root -p -h localhost << zzzzEOFzzz |
60 | create database if not exists $MYSQL_DB; | 60 | create database if not exists $MYSQL_DB; |
@@ -65,10 +65,14 @@ grant all on $MYSQL_DB.* to $OS_USER@localhost; | |||
65 | FLUSH PRIVILEGES; | 65 | FLUSH PRIVILEGES; |
66 | zzzzEOFzzz | 66 | zzzzEOFzzz |
67 | 67 | ||
68 | echo "Setting up OpenSim." | ||
69 | sudo adduser --system --shell /bin/bash --group $OS_USER | 68 | sudo adduser --system --shell /bin/bash --group $OS_USER |
70 | sudo addgroup $USER $OS_USER | 69 | sudo addgroup $USER $OS_USER |
71 | 70 | ||
71 | echo "Building OpenSim." | ||
72 | ./runprebuild.sh | ||
73 | ./nant-color | ||
74 | |||
75 | echo "Setting up OpenSim." | ||
72 | sudo rm -fr $OSPATH/opensim-IG_* | 76 | sudo rm -fr $OSPATH/opensim-IG_* |
73 | sudo mkdir -p $OSPATH/opensim-IG_$OSVER | 77 | sudo mkdir -p $OSPATH/opensim-IG_$OSVER |
74 | sudo cp -fr $PRGDIR/* $OSPATH/opensim-IG_$OSVER | 78 | sudo cp -fr $PRGDIR/* $OSPATH/opensim-IG_$OSVER |
@@ -93,10 +97,6 @@ sudo ln -fs ../../current/scripts/start-sim start-sim | |||
93 | sudo ln -fs ../../current/scripts/start-sim stop-sim | 97 | sudo ln -fs ../../current/scripts/start-sim stop-sim |
94 | popd >/dev/null | 98 | popd >/dev/null |
95 | 99 | ||
96 | echo "Building OpenSim." | ||
97 | ./runprebuild.sh | ||
98 | ./nant-color | ||
99 | |||
100 | echo "Securing OpenSim." | 100 | echo "Securing OpenSim." |
101 | sudo chown -R $OS_USER:$OS_USER $OSPATH | 101 | sudo chown -R $OS_USER:$OS_USER $OSPATH |
102 | sudo chmod -R 775 $OSPATH | 102 | sudo chmod -R 775 $OSPATH |
@@ -124,4 +124,4 @@ sudo chmod 644 /home/$OS_USER/.tmux.conf | |||
124 | 124 | ||
125 | sudo scripts/fix_var_run.sh | 125 | sudo scripts/fix_var_run.sh |
126 | 126 | ||
127 | echo "Done setting up OpenSim." | 127 | echo "Done installing OpenSim." |