diff --git a/Inspection/inspect.sh b/Inspection/inspect.sh index 5fdf59d..109d29e 100755 --- a/Inspection/inspect.sh +++ b/Inspection/inspect.sh @@ -71,7 +71,7 @@ echo "#################################################" echo "Test report" echo "#################################################" php ${TOOLS_PATH}/TestReportGenerator/src/index.php \ --b ${ROOT_PATH} \ +-b ${INSPECTION_PATH} \ -l ${BUILD_PATH}/Config/reportLang.php \ -s ${OUTPUT_PATH}/junit_phpcs.xml \ -sj ${OUTPUT_PATH}/junit_eslint.xml \ diff --git a/config.sh b/config.sh index 482cbb4..74b8b34 100755 --- a/config.sh +++ b/config.sh @@ -1,11 +1,10 @@ #!/bin/bash # Paths -BASE_PATH="/var/www/html" -ROOT_PATH="/var/www/html/Karaka" -BUILD_PATH="/var/www/html/Build" +BASE_PATH="${BUILD_PATH}/.." +ROOT_PATH="${BUILD_PATH}/.." -TOOLS_PATH="/var/www/html/Tools" +TOOLS_PATH="${BUILD_PATH}/.." RELEASE_PATH="/var/www/html/Release" # Web diff --git a/php.sh b/php.sh index 0a99c46..3128804 100644 --- a/php.sh +++ b/php.sh @@ -1,10 +1,8 @@ #!/bin/bash -SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -source "$SCRIPT_DIR/script2.sh" - # Include config -. "$SCRIPT_DIR/config.sh" +BUILD_PATH="$(dirname "$(readlink -f "$0")")" +. "$BUILD_PATH/config.sh" if [ $# -eq 0 ]; then echo "No parameters provided."