diff --git a/bin/03_compare_lists.bat b/bin/03_compare_lists.bat index 777d10a..be5b9d4 100644 --- a/bin/03_compare_lists.bat +++ b/bin/03_compare_lists.bat @@ -1,7 +1,5 @@ call cremig_setenv.bat @echo off -if "%1" == "-s" (set SIVAS_ID=%2) else (set /p SIVAS_ID=Enter Sivas ID:) - -call ..\Scripts\activate -python %CREMIG_LIB%\compare_lists.py --sivas=%SIVAS_ID% -pause +call %CREMIG%\.venv\Scripts\activate.bat +python %CREMIG_LIB%\compare_lists.py %* +deactivate diff --git a/bin/cremig_setenv.bat b/bin/cremig_setenv.bat index c298f2c..1bf8527 100644 --- a/bin/cremig_setenv.bat +++ b/bin/cremig_setenv.bat @@ -1,11 +1,16 @@ @echo off -set CREMIG=C:\Users\%USERNAME%\Documents\10-Develop\CreoMigrate +REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt +pushd %~dp0\.. +set CREMIG=%cd% set CREMIG_BIN=%CREMIG%\bin -set CREMIG_WORK=%CREMIG%\work set CREMIG_CFG=%CREMIG%\cfg set CREMIG_LIB=%CREMIG%\lib -set CREMIG_LOG=%CREMIG%\log set CREMIG_DATA=%CREMIG%\data +set CREMIG_WORK=%CREMIG%\work +set CREMIG_LOG=%CREMIG%\log + +if not exist %CREMIG%\work mkdir %CREMIG%\work +if not exist %CREMIG%\log mkdir %CREMIG%\log set PATH=%CREMIG%\bin;%PATH% @@ -14,3 +19,4 @@ set RD_DATABASE_SOURCE=Z:\Entwicklung\PLM\Bestandspool.csv set SIVAS_DATABASE_QUERY=Y:\jit\programme\Sivas2json.exe REM PYTHON_INCLUDE_DIR REM PYTHON_LIBRARY +popd