Update osp.bat
This commit is contained in:
parent
ff284e08cc
commit
e071af9f21
|
@ -131,10 +131,10 @@ goto end
|
||||||
:: -----------------------------------------------------------------------------------
|
:: -----------------------------------------------------------------------------------
|
||||||
:shutdown
|
:shutdown
|
||||||
if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
||||||
if exist "{root_dir}\data\ControlPanel\env_%%a.bat" call "{root_dir}\data\ControlPanel\env_%%a.bat" resetenv
|
if exist "{root_dir}\data\cli\env_%%a.bat" call "{root_dir}\data\cli\env_%%a.bat" resetenv
|
||||||
)
|
)
|
||||||
if not "%OSP_ADDONS_LIST%"=="" for %%a in (%OSP_ADDONS_LIST%) do (
|
if not "%OSP_ADDONS_LIST%"=="" for %%a in (%OSP_ADDONS_LIST%) do (
|
||||||
if exist "{root_dir}\data\ControlPanel\env_%%a.bat" call "{root_dir}\data\ControlPanel\env_%%a.bat" resetenv
|
if exist "{root_dir}\data\cli\env_%%a.bat" call "{root_dir}\data\cli\env_%%a.bat" resetenv
|
||||||
)
|
)
|
||||||
{system_environment}
|
{system_environment}
|
||||||
set "OSP_ACTIVE_ENV=System" & set "OSP_ACTIVE_ENV_VAL=:System:"
|
set "OSP_ACTIVE_ENV=System" & set "OSP_ACTIVE_ENV_VAL=:System:"
|
||||||
|
@ -260,13 +260,13 @@ if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
||||||
)
|
)
|
||||||
call :strfind "%OSP_MODULES_LIST_%" ":%OSP_TMP_NAME%:"
|
call :strfind "%OSP_MODULES_LIST_%" ":%OSP_TMP_NAME%:"
|
||||||
if not defined OSP_TMPVAL goto invalid
|
if not defined OSP_TMPVAL goto invalid
|
||||||
if not exist "{root_dir}\data\ControlPanel\shell_%OSP_TMP_NAME%.bat" set "OSP_ERR_MSG={lang_err_no_shell_config} %OSP_TMP_NAME%" & goto error
|
if not exist "{root_dir}\data\cli\shell_%OSP_TMP_NAME%.bat" set "OSP_ERR_MSG={lang_err_no_shell_config} %OSP_TMP_NAME%" & goto error
|
||||||
setlocal
|
setlocal
|
||||||
call :env_reset post
|
call :env_reset post
|
||||||
call "{root_dir}\data\ControlPanel\env_%OSP_TMP_NAME%.bat" %1 %OSP_TMP_NAME% %3 & call :post_env %1 %OSP_TMP_NAME% %3
|
call "{root_dir}\data\cli\env_%OSP_TMP_NAME%.bat" %1 %OSP_TMP_NAME% %3 & call :post_env %1 %OSP_TMP_NAME% %3
|
||||||
echo:
|
echo:
|
||||||
TITLE %OSP_TMP_NAME% shell ^| Open Server Panel
|
TITLE %OSP_TMP_NAME% shell ^| Open Server Panel
|
||||||
call "{root_dir}\data\ControlPanel\shell_%OSP_TMP_NAME%.bat"
|
call "{root_dir}\data\cli\shell_%OSP_TMP_NAME%.bat"
|
||||||
endlocal
|
endlocal
|
||||||
chcp 65001 > nul
|
chcp 65001 > nul
|
||||||
TITLE %OSP_ACTIVE_ENV% ^| Open Server Panel
|
TITLE %OSP_ACTIVE_ENV% ^| Open Server Panel
|
||||||
|
@ -284,10 +284,10 @@ if %ERRORLEVEL% gtr 0 goto error
|
||||||
:: -----------------------------------------------------------------------------------
|
:: -----------------------------------------------------------------------------------
|
||||||
:project
|
:project
|
||||||
if "%2"=="" goto eargument
|
if "%2"=="" goto eargument
|
||||||
if not exist "{root_dir}\data\ControlPanel\project_%2.bat" set "OSP_ERR_MSG={lang_err_no_env_config} %2" & goto error
|
if not exist "{root_dir}\data\cli\project_%2.bat" set "OSP_ERR_MSG={lang_err_no_env_config} %2" & goto error
|
||||||
set "OSP_TMP_CODEPAGE=%OSP_CODEPAGE%"
|
set "OSP_TMP_CODEPAGE=%OSP_CODEPAGE%"
|
||||||
set "OSP_TMP_ECHO_STATE=%OSP_ECHO_STATE%"
|
set "OSP_TMP_ECHO_STATE=%OSP_ECHO_STATE%"
|
||||||
call "{root_dir}\data\ControlPanel\project_%2.bat" %2 %3
|
call "{root_dir}\data\cli\project_%2.bat" %2 %3
|
||||||
@if %ERRORLEVEL% gtr 0 @set "OSP_ERR_STATE=ON"
|
@if %ERRORLEVEL% gtr 0 @set "OSP_ERR_STATE=ON"
|
||||||
@echo off
|
@echo off
|
||||||
chcp 65001 > nul
|
chcp 65001 > nul
|
||||||
|
@ -315,8 +315,8 @@ call :strfind "%OSP_ACTIVE_ENV_VAL%" ":%OSP_TMPVAL%"
|
||||||
if defined OSP_TMPVAL set "OSP_ERR_MSG={lang_err_env_modules_exist}" & goto error
|
if defined OSP_TMPVAL set "OSP_ERR_MSG={lang_err_env_modules_exist}" & goto error
|
||||||
call :strfind "%OSP_ACTIVE_ENV_VAL%" ":%OSP_TMP_NAME%:"
|
call :strfind "%OSP_ACTIVE_ENV_VAL%" ":%OSP_TMP_NAME%:"
|
||||||
if defined OSP_TMPVAL set "OSP_ERR_MSG={lang_err_env_already_active}" & goto error
|
if defined OSP_TMPVAL set "OSP_ERR_MSG={lang_err_env_already_active}" & goto error
|
||||||
if not exist "{root_dir}\data\ControlPanel\env_%OSP_TMP_NAME%.bat" set "OSP_ERR_MSG={lang_err_no_env_config} %OSP_TMP_NAME%" & goto error
|
if not exist "{root_dir}\data\cli\env_%OSP_TMP_NAME%.bat" set "OSP_ERR_MSG={lang_err_no_env_config} %OSP_TMP_NAME%" & goto error
|
||||||
call "{root_dir}\data\ControlPanel\env_%OSP_TMP_NAME%.bat" %1 %OSP_TMP_NAME% %3 & call :post_env %1 %OSP_TMP_NAME% %3
|
call "{root_dir}\data\cli\env_%OSP_TMP_NAME%.bat" %1 %OSP_TMP_NAME% %3 & call :post_env %1 %OSP_TMP_NAME% %3
|
||||||
goto end
|
goto end
|
||||||
:: -----------------------------------------------------------------------------------
|
:: -----------------------------------------------------------------------------------
|
||||||
:: MODULE ENVIRONMENT (USE)
|
:: MODULE ENVIRONMENT (USE)
|
||||||
|
@ -333,9 +333,9 @@ if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
||||||
call :strfind "%OSP_ADDONS_LIST_%" ":%OSP_TMP_NAME%:"
|
call :strfind "%OSP_ADDONS_LIST_%" ":%OSP_TMP_NAME%:"
|
||||||
if not defined OSP_TMPVAL call :strfind "%OSP_MODULES_LIST_%" ":%OSP_TMP_NAME%:"
|
if not defined OSP_TMPVAL call :strfind "%OSP_MODULES_LIST_%" ":%OSP_TMP_NAME%:"
|
||||||
if not defined OSP_TMPVAL goto invalid
|
if not defined OSP_TMPVAL goto invalid
|
||||||
if not exist "{root_dir}\data\ControlPanel\env_%OSP_TMP_NAME%.bat" set "OSP_ERR_MSG={lang_err_no_env_config} %OSP_TMP_NAME%" & goto error
|
if not exist "{root_dir}\data\cli\env_%OSP_TMP_NAME%.bat" set "OSP_ERR_MSG={lang_err_no_env_config} %OSP_TMP_NAME%" & goto error
|
||||||
call :env_reset post
|
call :env_reset post
|
||||||
call "{root_dir}\data\ControlPanel\env_%OSP_TMP_NAME%.bat" %1 %OSP_TMP_NAME% %3 & call :post_env %1 %OSP_TMP_NAME% %3
|
call "{root_dir}\data\cli\env_%OSP_TMP_NAME%.bat" %1 %OSP_TMP_NAME% %3 & call :post_env %1 %OSP_TMP_NAME% %3
|
||||||
goto end
|
goto end
|
||||||
:: -----------------------------------------------------------------------------------
|
:: -----------------------------------------------------------------------------------
|
||||||
:: DEFAULT SYSTEM ENVIRONMENT
|
:: DEFAULT SYSTEM ENVIRONMENT
|
||||||
|
@ -353,17 +353,17 @@ goto end
|
||||||
:: -----------------------------------------------------------------------------------
|
:: -----------------------------------------------------------------------------------
|
||||||
:env_reset
|
:env_reset
|
||||||
if /i "%1"=="pre" if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
if /i "%1"=="pre" if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
||||||
if exist "{root_dir}\data\ControlPanel\env_%%a.bat" call "{root_dir}\data\ControlPanel\env_%%a.bat" resetenv
|
if exist "{root_dir}\data\cli\env_%%a.bat" call "{root_dir}\data\cli\env_%%a.bat" resetenv
|
||||||
)
|
)
|
||||||
if /i "%1"=="pre" if not "%OSP_ADDONS_LIST%"=="" for %%a in (%OSP_ADDONS_LIST%) do (
|
if /i "%1"=="pre" if not "%OSP_ADDONS_LIST%"=="" for %%a in (%OSP_ADDONS_LIST%) do (
|
||||||
if exist "{root_dir}\data\ControlPanel\env_%%a.bat" call "{root_dir}\data\ControlPanel\env_%%a.bat" resetenv
|
if exist "{root_dir}\data\cli\env_%%a.bat" call "{root_dir}\data\cli\env_%%a.bat" resetenv
|
||||||
)
|
)
|
||||||
{system_environment}
|
{system_environment}
|
||||||
if /i "%1"=="post" if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
if /i "%1"=="post" if not "%OSP_MODULES_LIST%"=="" for %%a in (%OSP_MODULES_LIST%) do (
|
||||||
if exist "{root_dir}\data\ControlPanel\env_%%a.bat" call "{root_dir}\data\ControlPanel\env_%%a.bat" resetenv
|
if exist "{root_dir}\data\cli\env_%%a.bat" call "{root_dir}\data\cli\env_%%a.bat" resetenv
|
||||||
)
|
)
|
||||||
if /i "%1"=="post" if not "%OSP_ADDONS_LIST%"=="" for %%a in (%OSP_ADDONS_LIST%) do (
|
if /i "%1"=="post" if not "%OSP_ADDONS_LIST%"=="" for %%a in (%OSP_ADDONS_LIST%) do (
|
||||||
if exist "{root_dir}\data\ControlPanel\env_%%a.bat" call "{root_dir}\data\ControlPanel\env_%%a.bat" resetenv
|
if exist "{root_dir}\data\cli\env_%%a.bat" call "{root_dir}\data\cli\env_%%a.bat" resetenv
|
||||||
)
|
)
|
||||||
set "ESC="
|
set "ESC="
|
||||||
exit /b 0
|
exit /b 0
|
||||||
|
|
Loading…
Reference in a new issue