remove endlocals as they unset lots of things that are needed later in the script

Author: rerpha

installation_and_upgrade/_activate_venv.bat

@@ -40,7 +40,6 @@ IF EXIST "C:\Instrument\Apps\EPICS" (
   call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_pre_stop
   IF !errorlevel! neq 0 exit /b !errorlevel!
   start /wait cmd /c "%STOP_IBEX%"
-  ENDLOCAL
 )
 
 REM Copy the pydev command history file to temp so it can be copied back in after deploy (otherwise it is overwritten)
@@ -79,20 +78,11 @@ if "%DETECT_OLD_GALIL%" == "YES" (
     )
 )
 
-REM stop_ibex_server calls config_env which means we have to reactivate our venv
-call "%~dp0_activate_venv.bat"
-call "%~dp0set_epics_ca_addr_list.bat"
-
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_main
 IF %errorlevel% neq 0 exit /b %errorlevel%
-ENDLOCAL
 
 start /i /wait cmd /c "%START_IBEX%"
 
-REM start_ibex_server calls config_env which means we have to reactivate our venv
-call "%~dp0_activate_venv.bat"
-call "%~dp0set_epics_ca_addr_list.bat"
-
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_post_start
 call rmdir /s /q %UV_TEMP_VENV%
 

installation_and_upgrade/instrument_deploy.bat

@@ -35,14 +35,8 @@ set "STOP_IBEX=C:\Instrument\Apps\EPICS\stop_ibex_server"
 set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"
 IF EXIST "C:\Instrument\Apps\EPICS" (start /wait cmd /c "%STOP_IBEX%")
 
-
-REM stop_ibex_server calls config_env which means we have to reactivate our venv
-call "%~dp0_activate_venv.bat"
-call "%~dp0set_epics_ca_addr_list.bat"
-
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_install
 if %errorlevel% neq 0 goto ERROR
-ENDLOCAL
 
 start /wait cmd /c "%START_IBEX%"
 

installation_and_upgrade/instrument_install.bat

@@ -20,8 +20,6 @@ if %errorlevel% neq 0 goto ERROR
 set "STOP_IBEX=C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 IF EXIST "C:\Instrument\Apps\EPICS" (
     call "%STOP_IBEX%"
-    REM stop_ibex_server calls config_env which means we have to reactivate our venv
-    call "%~dp0_activate_venv.bat"
 ) else (
     REM in case one has been left around running in the background
     taskkill /f /im caRepeater.exe

installation_and_upgrade/instrument_install_latest_build_only.bat

@@ -11,7 +11,6 @@ set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"
 
 start /wait cmd /c "%STOP_IBEX%"
 
-call "%~dp0_activate_venv.bat"
 call python -u "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step force_upgrade_mysql
 
 IF %errorlevel% neq 0 (

installation_and_upgrade/upgrade_mysql.bat

@@ -12,7 +12,6 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
-call "%~dp0_activate_venv.bat"
 call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" create_vhds --quiet --no_log_to_var
 IF %ERRORLEVEL% NEQ 0 (
   set errcode = %ERRORLEVEL%

installation_and_upgrade/vhd_build.bat

@@ -11,7 +11,6 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
-call "%~dp0_activate_venv.bat"
 call python "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" request_dismount_vhds --quiet --no_log_to_var
 
 IF %ERRORLEVEL% NEQ 0 (

installation_and_upgrade/vhd_build_force_cleanup.bat

@@ -11,7 +11,6 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
-call "%~dp0_activate_venv.bat"
 call python -u "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" create_vhds --quiet --no_log_to_var
 
 IF %ERRORLEVEL% NEQ 0 (