diff --git a/Inspection/Html/attributes.sh b/Inspection/Html/attributes.sh index f71ae92..4c4ea28 100644 --- a/Inspection/Html/attributes.sh +++ b/Inspection/Html/attributes.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start html attributes inspection\n" diff --git a/Inspection/Html/tags.sh b/Inspection/Html/tags.sh index 784ebeb..aca8d0c 100644 --- a/Inspection/Html/tags.sh +++ b/Inspection/Html/tags.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start html tags inspection\n" diff --git a/Inspection/Js/security.sh b/Inspection/Js/security.sh index 407f577..f6042b1 100644 --- a/Inspection/Js/security.sh +++ b/Inspection/Js/security.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start js security inspection\n" diff --git a/Inspection/Json/linting.sh b/Inspection/Json/linting.sh index a1c631f..b907251 100644 --- a/Inspection/Json/linting.sh +++ b/Inspection/Json/linting.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start json linting inspection\n" diff --git a/Inspection/Php/linting.sh b/Inspection/Php/linting.sh index 5def321..4bc4416 100644 --- a/Inspection/Php/linting.sh +++ b/Inspection/Php/linting.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start php linting inspection\n" diff --git a/Inspection/Php/security.sh b/Inspection/Php/security.sh index 8ee42c2..2a2faa3 100644 --- a/Inspection/Php/security.sh +++ b/Inspection/Php/security.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start php security inspection\n" diff --git a/Inspection/Php/stats.sh b/Inspection/Php/stats.sh index 3eeef73..8e208db 100644 --- a/Inspection/Php/stats.sh +++ b/Inspection/Php/stats.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start php stats inspection\n" diff --git a/Inspection/Php/style.sh b/Inspection/Php/style.sh index 96ec76f..07bb56d 100644 --- a/Inspection/Php/style.sh +++ b/Inspection/Php/style.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh echo "Start php style inspection\n" diff --git a/Inspection/inspect.sh b/Inspection/inspect.sh index 99a15ff..7523d6b 100644 --- a/Inspection/inspect.sh +++ b/Inspection/inspect.sh @@ -1,7 +1,7 @@ #!/bin/bash # Include config -. ${BUILD_PATH}/config.sh +. config.sh # Setting up database for demo and testing mysql -e 'drop database if exists oms;' -u ${DB_USER} -p${DB_PASSWORD} diff --git a/Js/build.sh b/Js/build.sh index 7122ebe..c4b7e52 100644 --- a/Js/build.sh +++ b/Js/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -. ${BUILD_PATH}/config.sh +. config.sh . ${BUILD_PATH}/Js/buildBase.sh . ${BUILD_PATH}/Js/buildLib.sh diff --git a/setup.sh b/setup.sh index 2b2ca70..cf52895 100644 --- a/setup.sh +++ b/setup.sh @@ -77,8 +77,5 @@ if [ ! -d "$TOOLS_PATH" ]; then chmod -R 777 ${TOOLS_PATH} cp ${ROOT_PATH}/composer.json ${TOOLS_PATH}/composer.json - php composer.phar install + php ${TOOLS_PATH}/composer.phar install --working-dir=${ROOT_PATH}/ fi - -# Link vendor -ln -s ${TOOLS_PATH}/vendor ${ROOT_PATH}/vendor