run.bat rausgeschmissen und alles in setenv.bat und getexdraw.bat integriert. install.bat mit angepasst

bin/getexdraw.bat

@@ -3,12 +3,21 @@
 if [%1]==[] goto usage
 for /F %%i in ("%1") do set FILENAME=%%~ni
 
+    
+call setenv.bat
+
+
 echo --hole Positionen
 call getpositions.bat --filename %1 -s -r -w  %FILENAME%_positions.json
 echo --erzeuge Graph mit Routing
 call routing.bat --filename %FILENAME%_positions.json -w %FILENAME%_todraw.json 
 echo --zeichne Kabel in dxf Datei 
 call draw_dxf.bat --filename %FILENAME%_todraw.json --new %FILENAME%_cables.dxf -x %FILENAME%_cables.xlsx --copy_layer %FILENAME%_reduziert.dxf --origin %1
+
+move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%
+pause
+
+
 goto :eof
 
 

bin/install.bat

@@ -1,11 +1,11 @@
 @echo on
 
-set TARGETDIR="%USERPROFILE%\Desktop\Kabeltool"
-mkdir %TARGETDIR%
-set SHORTCUT=%TARGETDIR%\create_cables.lnk
-set CHECKOUT_DIR="C:\kabellaengen"
+call setenv.bat
 
-set TARGET=%CHECKOUT_DIR%\bin\run.bat
-set ICON=%CHECKOUT_DIR%\doc\img\Icons\Icon_Gemini2.ico
+mkdir %INSTALL_DIR%
+set SHORTCUT=%INSTALL_DIR%\create_cables.lnk
+
+set TARGET=%PROJECT_BIN%\getexdraw.bat
+set ICON=%PROJECT_DOC%\img\Icons\Icon_Gemini2.ico
  
 powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT%');$s.TargetPath='%TARGET%';$s.IconLocation='%ICON%';$s.Save()"

bin/setenv.bat

@@ -2,23 +2,23 @@
 REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt 
 pushd %~dp0\..
 
-set PROJECT=%cd%
+set PROJECT=C:\kabellaengen
 set PROJECT_BIN=%PROJECT%\bin
 set PROJECT_CFG=%PROJECT%\cfg
+set PROJECT_DOC=%PROJECT%\doc
 set PROJECT_LIB=%PROJECT%\lib
 set PROJECT_DATA=%PROJECT%\data
 set PROJECT_WORK=%PROJECT%\work
-set PROJECT_LOG=%PROJECT%\log
 set PROJECT_TEST=%PROJECT%\testdata
-set PROJECT_HOT=%PROJECT%\hotfolder
 
 if not exist %PROJECT%\work mkdir %PROJECT%\work
-if not exist %PROJECT%\log mkdir %PROJECT%\log
 if not exist %PROJECT%\data mkdir %PROJECT%\data
-if not exist %PROJECT%\hotfolder mkdir %PROJECT%\hotfolder
+
+set INSTALL_DIR="%USERPROFILE%\Desktop\Kabeltool"
 
 set PATH=%PROJECT_BIN%;%PATH%
 
+
 popd
 goto :eof