From 1abbde69f61e894058b3a3a40a6bf58d0f087bc3 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 6 Jan 2018 16:45:35 +0100
Subject: [PATCH] Fix composer file setup

---
 inspect.sh | 2 +-
 setup.sh   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/inspect.sh b/inspect.sh
index afaa641..e9732dd 100644
--- a/inspect.sh
+++ b/inspect.sh
@@ -9,7 +9,7 @@ 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
+#. Js/build.sh
 
 # Executing unit tests
 . Inspection/Php/tests.sh
diff --git a/setup.sh b/setup.sh
index 7195b4f..36e5c87 100644
--- a/setup.sh
+++ b/setup.sh
@@ -27,6 +27,9 @@ do
     c=$((c+1))
 done
 
+cd ${ROOT_PATH}
+git submodule update --init --recursive
+
 # Creating directories for inspection
 mkdir -p ${INSPECTION_PATH}/logs
 mkdir -p ${INSPECTION_PATH}/Framework/logs
@@ -68,7 +71,8 @@ if [ ! -d "$TOOLS_PATH" ]; then
     wget -nc http://dl.google.com/closure-compiler/compiler-latest.tar.gz
     tar -zxvf compiler-latest.tar.gz
 
-    cp ${BUILD_PATH}/Configs/composer.json ${TOOLS_PATH}/composer.json
+    chmod -R 777 ${TOOLS_PATH}
+    cp ${ROOT_PATH}/composer.json ${TOOLS_PATH}/composer.json
 
     php composer.phar install
 fi