From 2d780713306666b7c61da8aa91597bcda6ac16a3 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Mon, 1 Jul 2019 12:22:58 -0400
Subject: [PATCH] bundle folder name is broken :(

---
 .../build_current_bundle.bat                         | 10 ++++------
 misc/jenkins/unit_tests/unit_tests.bat               | 12 ++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
index 0f40c04912..c29243df4c 100644
--- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
+++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
@@ -85,7 +85,7 @@ echo "%script_name%: folder variable3=%folder%"
 pwd
 call misc\jenkins\build_working_folder.bat
 IF NOT ERRORLEVEL 0 (
- echo %script_name%: ERROR invoking build_working_folder.bat
+ echo %script_name%: ERROR: invoking build_working_folder.bat
  EXIT /B 1
 )
 
@@ -107,11 +107,9 @@ echo "%script_name%: Making rusefi_simulator.zip"
 pwd
 zip -j temp/rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar
 
-cd temps
-if not exist rusefi_bundle.zip (
- echo %script_name%: not found rusefi_bundle.zip
- EXIT /B 1
-)
+cd temp
+if not exist rusefi_bundle.zip echo %script_name%: ERROR not found rusefi_bundle.zip
+if not exist rusefi_bundle.zip EXIT /B 1
 
 echo "%script_name%: Uploading stuff"
 ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . rusefi_bundle.zip
diff --git a/misc/jenkins/unit_tests/unit_tests.bat b/misc/jenkins/unit_tests/unit_tests.bat
index dfaf0df732..b67aa2f0ca 100644
--- a/misc/jenkins/unit_tests/unit_tests.bat
+++ b/misc/jenkins/unit_tests/unit_tests.bat
@@ -15,12 +15,12 @@ git submodule update --init
 rm -fR .dep
 rm -fR build
 call update_version.bat
-IF NOT ERRORLEVEL 0 echo ERROR INVOKING VERSION HEADER GENERATOR
+IF NOT ERRORLEVEL 0 echo ERROR: INVOKING VERSION HEADER GENERATOR
 IF NOT ERRORLEVEL 0 EXIT /B 1
 
 
 make -j6
-if not exist build/rusefi.hex echo FAILED TO COMPILE FIRMWARE
+if not exist build/rusefi.hex echo ERROR: FAILED TO COMPILE FIRMWARE
 if not exist build/rusefi.hex exit -1
 cd ..
 
@@ -33,14 +33,14 @@ rem Only here we are building unit_tests
 call compile.bat
 pwd
 ls -l build
-if not exist build/rusefi_test.exe echo FAILED TO COMPILE UNIT TESTS
+if not exist build/rusefi_test.exe echo ERROR: FAILED TO COMPILE UNIT TESTS
 if not exist build/rusefi_test.exe exit -1
 
 echo "TIMESTAMP %date% %time% Unit tests build looks good, now executing unit tests"
 
 cd build
 call rusefi_test.exe
-IF NOT ERRORLEVEL 0 echo UNIT TEST FAILED
+IF NOT ERRORLEVEL 0 echo ERROR: UNIT TEST FAILED
 IF NOT ERRORLEVEL 0 EXIT /B 1
 
 cd ..
@@ -53,11 +53,11 @@ pwd
 
 echo Preparing firmware-only fast upload
 zip -j firmware/build/rusefi_firmware.zip firmware/svnversion.h firmware/build/rusefi.hex firmware/build/rusefi.bin  firmware/build/rusefi.elf firmware/tunerstudio/rusefi.ini
-IF NOT ERRORLEVEL 0 echo Invoking ZIP has failed
+IF NOT ERRORLEVEL 0 echo ERROR: Invoking ZIP has failed
 IF NOT ERRORLEVEL 0 EXIT /B 1
 
 echo "TIMESTAMP %date% %time% Now uploading only firmware
 
 ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% separate_files firmware/build/rusefi_firmware.zip
-IF NOT ERRORLEVEL 0 echo Invoking ncftpput has failed
+IF NOT ERRORLEVEL 0 echo ERROR: Invoking ncftpput has failed
 IF NOT ERRORLEVEL 0 EXIT /B 1