windows build script should not close cmd

netinvent · Dec 10, 2024 · 29027cf · 29027cf
1 parent 2ba75e8
commit 29027cf
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/bin/COMPILE.cmd b/bin/COMPILE.cmd
@@ -7,7 +7,7 @@ SET PYTHON32=c:\python37-32\python.exe
 
 
 cd C:\GIT\npbackup
-git pull || exit 1
+git pull || GOTO ERROR
 
 :: cd RESTIC_SOURCE_FILES
 :: cat update_restic.sh | dos2unix | sh
@@ -17,18 +17,21 @@ git pull || exit 1
 SET OLD_PYTHONPATH=%PYTHONPATH%
 SET PYTHONPATH=c:\GIT\npbackup
 
-%PYTHON64% RESTIC_SOURCE_FILES/update_restic.py || exit 1
+%PYTHON64% RESTIC_SOURCE_FILES/update_restic.py || GOTO ERROR
 
 %PYTHON64% -m pip install pytest
-%PYTHON64% -m pytest /opt/npbackup/tests || exit 1
+%PYTHON64% -m pytest /opt/npbackup/tests || GOTO ERROR
 
-"%PYTHON64%" -m pip install --upgrade -r npbackup/requirements.txt || exit 1
+"%PYTHON64%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR
 "%PYTHON64%" bin\compile.py --audience all --sign "C:\ODJ\KEYS\NetInventEV.dat"
 
 
-"%PYTHON32%" -m pip install --upgrade -r npbackup/requirements.txt || exit 1
+"%PYTHON32%" -m pip install --upgrade -r npbackup/requirements.txt || GOTO ERROR
 "%PYTHON32%" bin\compile.py --audience all --sign "C:\ODJ\KEYS\NetInventEV.dat"
 
+:ERROR
+echo "Failed to run build script"
+:END
 SET PYTHONPATH=%OLD_PYTHONPATH%