Fix vhost.conf path and change validationFailedExit calls to exitScript

Author: steevanb

initializeBranch.sh

@@ -176,7 +176,7 @@ function createVhostFile {
     if [ ! -f "$vhostPath" ]; then
         echoValidationGroupStart "Create .phpbenchmarks/vhost.conf"
 
-        cp "$BENCHMARK_KIT_PATHvalidation/mainRepository/.phpbenchmarks/vhost.conf" "$INSTALLATION_PATH/.phpbenchmarks/"
+        cp "$BENCHMARK_KIT_PATH/validation/mainRepository/.phpbenchmarks/vhost.conf" "$INSTALLATION_PATH/.phpbenchmarks/"
         [ $? != "0" ] && exitScript "Error while writing $vhostPath."
         echoValidatedTest "File created."
         echoValidationWarning ".phpbenchmarks/vhost.conf has been created with default nginx virtual host configuration. Edit it if needed."

validation/configurationValidation.sh

@@ -100,11 +100,9 @@ function assertInitBenchmark {
     assertConfigurationFileExist "initBenchmark.sh"
 
     source $CONFIGURATION_PATH/initBenchmark.sh
-    [ "$?" != "0" ] && validationFailedExit "File init_benchmark.sh could not be included."
+    [ "$?" != "0" ] && exitScript "File init_benchmark.sh could not be included."
 
     type initBenchmark &>/dev/null
-    [ "$?" != "0" ] \
-        && cat /tmp/phpbenchmarks.docker.build \
-        && validationFailedExit "Function init_benchmark.sh::initBenchmark() does not exist. See README.md for more informations."
+    [ "$?" != "0" ] && exitScript "Function init_benchmark.sh::initBenchmark() does not exist. See README.md for more informations."
     echoValidatedTest "[.phpbenchmarks/initBenchmark.sh] Function initBenchmark() exist."
 }