diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat index c1951c6..4bd1de2 100644 --- a/bin/getexdraw.bat +++ b/bin/getexdraw.bat @@ -31,7 +31,7 @@ call getpositions.bat --filename %1 -s -r -w %JSON_POS% -e %ERROR_DOUBLE% if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" ( @echo -failed- duplicate IDs in given layout pause - move %PROJECT_WORK%\%ERROR_DOUBLE% %INSTALL_DIR% + move %PROJECT_WORK%\%ERROR_DOUBLE% %PROJECT_BOM_RESULTS% goto :eof ) if not exist "%PROJECT_WORK%\%JSON_POS%" ( @@ -57,8 +57,8 @@ if not exist "%PROJECT_WORK%\%EXCEL_RES%" ( ) echo. -mkdir %INSTALL_DIR%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%_* %BOM_RESULTS_DIR%\%FILENAME% +mkdir %PROJECT_BOM_RESULTS%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%_* %PROJECT_BOM_RESULTS%\%FILENAME% pause diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat index 734c4e0..667da83 100644 --- a/bin/ioconverter.bat +++ b/bin/ioconverter.bat @@ -28,7 +28,7 @@ call getpositions.bat --filename %1 -s -r -w %JSON_POS% -e %ERROR_DOUBLE% if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" ( @echo == failed: duplicate IDs in given layout pause - move %PROJECT_WORK%\%ERROR_DOUBLE% %INSTALL_DIR% + move %PROJECT_WORK%\%ERROR_DOUBLE% %PROJECT_IO_RESULTS% goto :eof ) if not exist "%PROJECT_WORK%\%JSON_POS%" ( @@ -43,8 +43,8 @@ if not exist %RESULT_TIA% ( pause goto :eof ) -mkdir %INSTALL_DIR%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%-* %IO_RESULTS_DIR%\%FILENAME% +mkdir %PROJECT_IO_RESULTS%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME% pause goto :eof diff --git a/bin/setenv.bat b/bin/setenv.bat index c91ceb3..7799e9d 100644 --- a/bin/setenv.bat +++ b/bin/setenv.bat @@ -15,8 +15,8 @@ set SIVAS_EXCEL_EXPORT_DIR=%PROJECT_DATA% if not exist %PROJECT%\work mkdir %PROJECT%\work if not exist %PROJECT%\data mkdir %PROJECT%\data -set IO_RESULTS_DIR=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer -set BOM_RESULTS_DIR=Z:\Automatisierung\Konvertierungstools\3_Kabellängen-Konvertierer +set PROJECT_IO_RESULTS=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer +set PROJECT_BOM_RESULTS=Z:\Automatisierung\Konvertierungstools\3_Kabellängen-Konvertierer set INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool" set PATH=%PROJECT_BIN%;%PATH%