From 4b906e0bb06ca977308843bec335a8de2e7acdb4 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 16 Mar 2019 23:30:37 +0100
Subject: [PATCH] Fix build

---
 Inspection/inspect.sh | 1 -
 config.sh             | 2 +-
 install.sh            | 7 ++++---
 setup.sh              | 4 ++++
 test.php              | 3 ---
 5 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100755 test.php

diff --git a/Inspection/inspect.sh b/Inspection/inspect.sh
index 58a45a8..5c699e2 100755
--- a/Inspection/inspect.sh
+++ b/Inspection/inspect.sh
@@ -6,7 +6,6 @@
 # Setting up database for demo and testing
 mysql -e 'drop database if exists oms;' -u ${DB_USER} -p${DB_PASSWORD}
 mysql -e 'create database oms;' -u ${DB_USER} -p${DB_PASSWORD}
-#echo "USE mysql;\nUPDATE user SET password=PASSWORD('123456') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
 
 # Build js
 #. Js/build.sh
diff --git a/config.sh b/config.sh
index 6598818..846cd09 100755
--- a/config.sh
+++ b/config.sh
@@ -15,7 +15,7 @@ MAIL_ADDR=""
 
 # Authentications
 DB_USER="root"
-DB_PASSWORD="123456"
+DB_PASSWORD=""
 
 # Git variables
 GITHUB_URL[0]="https://github.com/Orange-Management/Orange-Management.git"
diff --git a/install.sh b/install.sh
index 654c83c..7b88413 100755
--- a/install.sh
+++ b/install.sh
@@ -16,6 +16,7 @@ apt-get install npm git php7.2 php7.2-cli php7.2-common php7.2-mysql php7.2-pgsq
 # USE mysql;
 # mysql < 5.7
 # UPDATE user SET plugin='mysql_native_password' WHERE User='root';
+# UPDATE user SET password=PASSWORD("") WHERE User='root';
 # FLUSH PRIVILEGES;
 # exit;
 # else mysql >= 5.7
@@ -59,12 +60,12 @@ sudo useradd -d /home/test -g mail -u 1001 -s /bin/bash test
 # npm
 npm install -D jasmine jasmine-node istanbul jasmine-console-reporter supertest jasmine-supertest
 
-systemctl restart apache2
-
 # FTP
 apt-get install vsftpd
 
 # /etc/vstftpd.conf
 # write_enable=YES
 # anon_upload_enable=YES
-# connect_from_port_20=NO
\ No newline at end of file
+# connect_from_port_20=NO
+
+systemctl restart apache2
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 0ec0635..45988c3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,6 +25,10 @@ do
     git clone -b ${GIT_BRANCH} $i
 done
 
+cd ${BASE_PATH}/Website
+git submodule update --init --recursive
+git submodule foreach git checkout develop
+
 cd ${ROOT_PATH}
 git submodule update --init --recursive
 git submodule foreach git checkout develop
diff --git a/test.php b/test.php
deleted file mode 100755
index 9aff8b1..0000000
--- a/test.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-var_dump(extension_loaded('gd'));