From 0a3fe7dda871e2e88caf5549de6688088bd55c45 Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 29 Jul 2025 17:30:42 +0200 Subject: [PATCH] =?UTF-8?q?Abfrage=20=C3=BCber=20eine=20=5Fsetenv.bat=20ei?= =?UTF-8?q?ngebaut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/getexdraw.bat | 8 ++++---- bin/ioconverter.bat | 5 +++++ bin/setenv.bat | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat index f008b9d..e4c4cc0 100644 --- a/bin/getexdraw.bat +++ b/bin/getexdraw.bat @@ -19,12 +19,12 @@ set ERROR_DOUBLE=%FILENAME%_errors.json set EXCEL_RES=%FILENAME%_cables.xlsx set DXF_RES=%FILENAME%_cables.dxf -echo on -call C:\kabellaengen\bin\setenv.bat -if exist "_setenv_local.bat" ( - call _setenv_local.bat +if exist "%~dp0_setenv.bat" ( + echo Lade lokale Umgebungseinstellungen aus _setenv.bat... + call "%~dp0_setenv.bat" ) +echo on echo. echo === Fetching Positions === call getpositions.bat --filename %1 -s -r -w %JSON_POS% -e %ERROR_DOUBLE% diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat index 547fd1a..9c066a2 100644 --- a/bin/ioconverter.bat +++ b/bin/ioconverter.bat @@ -19,6 +19,11 @@ REM Namen der Ergebnisdateien set ERROR_DOUBLE=%FILENAME%_errors.json set RESULT_TIA=%FILENAME%-*_TIA.xlsx +if exist "%~dp0_setenv.bat" ( + echo Lade lokale Umgebungseinstellungen aus _setenv.bat... + call "%~dp0_setenv.bat" +) + echo. diff --git a/bin/setenv.bat b/bin/setenv.bat index 89ffe10..870a593 100644 --- a/bin/setenv.bat +++ b/bin/setenv.bat @@ -21,6 +21,11 @@ set PROJECT_IO_RESULTS=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer set PROJECT_BOM_RESULTS=Z:\Automatisierung\Konvertierungstools\3_Kabellaengen-Konvertierer set INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool" +if exist "%~dp0_setenv.bat" ( + echo Lade lokale Umgebungseinstellungen aus _setenv.bat... + call "%~dp0_setenv.bat" +) + set PATH=%PROJECT_BIN%;%PATH%