diff --git a/build/buildAndDeploy.bat b/build/buildAndDeploy.bat index 01806953b4..e3ddb9ad4e 100644 --- a/build/buildAndDeploy.bat +++ b/build/buildAndDeploy.bat @@ -1,8 +1,12 @@ +@echo off PUSHD %~dp0 +setlocal EnableDelayedExpansion + call runasadmin.bat "%~dpnx0" + if %errorlevel% == 0 ( -call start\stop.bat +rem call start\stop.bat PUSHD %~dp0.. @@ -12,7 +16,14 @@ call build\build.static.bat echo "BACK-END" call build\build.backend.bat -start /b call build\start\start.bat +if %errorlevel% == 0 ( + for /R "build\run\" %%f in (*.bat) do ( + call build\run\%%~nxf publish + call dotnet -d publish -c Debug --no-restore --no-build --self-contained -o !servicepath! !servicesource!!servicename!.csproj + ) +) + +rem start /b call build\start\start.bat pause ) \ No newline at end of file diff --git a/build/install/install.bat b/build/install/install.bat index ec810071c0..8be14882ff 100644 --- a/build/install/install.bat +++ b/build/install/install.bat @@ -3,6 +3,7 @@ call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call nssm install Onlyoffice%%~nf "%%~f" + call run\%%~nxf service + call sc install "Onlyoffice %%~nf" binPath="%servicepath%" ) ) \ No newline at end of file diff --git a/build/install/uninstall.bat b/build/install/uninstall.bat index 1fb161ac25..4f85b061f9 100644 --- a/build/install/uninstall.bat +++ b/build/install/uninstall.bat @@ -3,6 +3,6 @@ call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call nssm remove Onlyoffice%%~nf + call sc delete "Onlyoffice %%~nf" ) ) \ No newline at end of file diff --git a/build/run/ApiSystemService.bat b/build/run/ApiSystemService.bat index e3f2893c26..c06e2ebafc 100644 --- a/build/run/ApiSystemService.bat +++ b/build/run/ApiSystemService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Notify" -call dotnet run --project ..\..\common\services\ASC.ApiSystem\ASC.ApiSystem.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=apisystem \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\apisystem +set servicename=ASC.ApiSystem + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.ApiSystem\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=apisystem +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/BackupService.bat b/build/run/BackupService.bat index a8e245638d..dc7c6f9f32 100644 --- a/build/run/BackupService.bat +++ b/build/run/BackupService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Backup" -call dotnet run --project ..\..\common\services\ASC.Data.Backup\ASC.Data.Backup.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=backup \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\backup +set servicename=ASC.Data.Backup + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Data.Backup\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=backup +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/CalendarServer.bat b/build/run/CalendarServer.bat index 1072ae298a..00e235ea72 100644 --- a/build/run/CalendarServer.bat +++ b/build/run/CalendarServer.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Calendar" -call dotnet run --project ..\..\products\ASC.Calendar\Server\ASC.Calendar.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=calendar \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.Calendar\server +set servicename=ASC.Calendar + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.Calendar\Server\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=calendar +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/ClearEvents.bat b/build/run/ClearEvents.bat index 7b01e90869..60aabee03d 100644 --- a/build/run/ClearEvents.bat +++ b/build/run/ClearEvents.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.ClearEvents" -call dotnet run --project ..\..\common\services\ASC.ClearEvents\ASC.ClearEvents.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=clearEvents \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\clearevents +set servicename=ASC.ClearEvents + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.ClearEvents\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=clearEvents +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/CrmBackgroundTasks.bat b/build/run/CrmBackgroundTasks.bat deleted file mode 100644 index 0e43feef22..0000000000 --- a/build/run/CrmBackgroundTasks.bat +++ /dev/null @@ -1,2 +0,0 @@ -echo "RUN ASC.CRM.BackgroundTasks" -call dotnet run --project ..\..\products\ASC.CRM\BackgroundTasks\ASC.CRM.BackgroundTasks.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=crm \ No newline at end of file diff --git a/build/run/CrmServer.bat b/build/run/CrmServer.bat index ed21485603..52f5a1ef5a 100644 --- a/build/run/CrmServer.bat +++ b/build/run/CrmServer.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.CRM.Server" -call dotnet run --project ..\..\products\ASC.CRM\Server\ASC.CRM.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=crm \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.CRM\server\ +set servicename=ASC.CRM + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.CRM\Server\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=crm +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/EncryptionService.bat b/build/run/EncryptionService.bat index 9ffa556825..582a4a1e76 100644 --- a/build/run/EncryptionService.bat +++ b/build/run/EncryptionService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Data.Storage.Encryption" -call dotnet run --project ..\..\common\services\ASC.Data.Storage.Encryption\ASC.Data.Storage.Encryption.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=encryption \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\encryption +set servicename=ASC.Data.Storage.Encryption + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Data.Storage.Encryption\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=encryption +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/FileServer.bat b/build/run/FileServer.bat index ffca875cc2..8661225270 100644 --- a/build/run/FileServer.bat +++ b/build/run/FileServer.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Files" -call dotnet run --project ..\..\products\ASC.Files\Server\ASC.Files.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=files \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.Files\server\ +set servicename=ASC.Files + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.Files\Server\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=files +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/FileService.bat b/build/run/FileService.bat index ab02e8eb4a..dad3e17169 100644 --- a/build/run/FileService.bat +++ b/build/run/FileService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Files" -call dotnet run --project ..\..\products\ASC.Files\Service\ASC.Files.Service.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=files \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.Files\service\ +set servicename=ASC.Files.Service + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.Files\Service\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=files.service +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/MailServer.bat b/build/run/MailServer.bat index d44b27df0e..47f76ddb7b 100644 --- a/build/run/MailServer.bat +++ b/build/run/MailServer.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Mail" -call dotnet run --project ..\..\products\ASC.Mail\Server\ASC.Mail.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=mail \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.Mail\server +set servicename=ASC.Mail + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.Mail\Server\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=mail +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/MigrationService.bat b/build/run/MigrationService.bat index 9e91841db2..fa9dc870c5 100644 --- a/build/run/MigrationService.bat +++ b/build/run/MigrationService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Migration" -call dotnet run --project ..\..\common\services\ASC.Data.Storage.Migration\ASC.Data.Storage.Migration.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=migration \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\migration +set servicename=ASC.Data.Storage.Migration + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Data.Storage.Migration\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=migration +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/NotifyService.bat b/build/run/NotifyService.bat index f0d96b35da..b1722a9d83 100644 --- a/build/run/NotifyService.bat +++ b/build/run/NotifyService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Notify" -call dotnet run --project ..\..\common\services\ASC.Notify\ASC.Notify.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=notify \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\notify +set servicename=ASC.Notify + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Notify\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=notify +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/PeopleServer.bat b/build/run/PeopleServer.bat index b377f7e1c0..b2655a09e0 100644 --- a/build/run/PeopleServer.bat +++ b/build/run/PeopleServer.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.People" -call dotnet run --project ..\..\products\ASC.People\Server\ASC.People.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=people \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.People\server\ +set servicename=ASC.People + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.People\Server\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=people +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/ProjectsServer.bat b/build/run/ProjectsServer.bat index 3243ff028a..20317e1d7a 100644 --- a/build/run/ProjectsServer.bat +++ b/build/run/ProjectsServer.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Projects" -call dotnet run --project ..\..\products\ASC.Projects\Server\ASC.Projects.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=projects \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\products\ASC.Projects\server +set servicename=ASC.Projects + +PUSHD %~dp0..\.. +set servicesource=%cd%\products\ASC.Projects\Server\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=projects +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/Radicale.bat b/build/run/Radicale.bat index baa54723bc..a6c51d04e4 100644 --- a/build/run/Radicale.bat +++ b/build/run/Radicale.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Radicale" -call dotnet run --project ..\..\common\services\ASC.Radicale\ASC.Radicale.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=radicale \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\radicale\service +set servicename=ASC.Radicale + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Radicale\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=radicale +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/Socket.IO.bat b/build/run/Socket.IO.bat index 64be95b749..c3180dee60 100644 --- a/build/run/Socket.IO.bat +++ b/build/run/Socket.IO.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Socket.IO.Svc" -call dotnet run --project ..\..\common\services\ASC.Socket.IO.Svc\ASC.Socket.IO.Svc.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=socket \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\socket\service +set servicename=ASC.Socket.IO.Svc + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Socket.IO.Svc\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=socket +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/SsoAuth.bat b/build/run/SsoAuth.bat index 44951f214b..42253c62b8 100644 --- a/build/run/SsoAuth.bat +++ b/build/run/SsoAuth.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.SsoAuth.Svc" -call dotnet run --project ..\..\common\services\ASC.SsoAuth.Svc\ASC.SsoAuth.Svc.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=ssoauth \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\ssoauth\service +set servicename=ASC.SsoAuth.Svc + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.SsoAuth.Svc\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=ssoauth +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/StudioNotifyService.bat b/build/run/StudioNotifyService.bat index b70737c415..e0942b153c 100644 --- a/build/run/StudioNotifyService.bat +++ b/build/run/StudioNotifyService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Studio.Notify" -call dotnet run --project ..\..\common\services\ASC.Studio.Notify\ASC.Studio.Notify.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=studio.notify \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\studio.notify +set servicename=ASC.Studio.Notify + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Studio.Notify\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=studio.notify +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/TelegramService.bat b/build/run/TelegramService.bat index a17c5ba88b..6f803277f4 100644 --- a/build/run/TelegramService.bat +++ b/build/run/TelegramService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.TelegramService" -call dotnet run --project ..\..\common\services\ASC.TelegramService\ASC.TelegramService.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=telegram \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\telegram +set servicename=ASC.TelegramService + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.TelegramService\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=telegram +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/Thumbnails.bat b/build/run/Thumbnails.bat index 1255eaf27c..d8aefc3569 100644 --- a/build/run/Thumbnails.bat +++ b/build/run/Thumbnails.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Thumbnails.Svc" -call dotnet run --project ..\..\common\services\ASC.Thumbnails.Svc\ASC.Thumbnails.Svc.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=thumbnails \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\thumb\service +set servicename=ASC.Thumbnails.Svc + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.Thumbnails.Svc\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=thumbnails +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/UrlShortenerService.bat b/build/run/UrlShortenerService.bat index 37f4420f65..58b5b69664 100644 --- a/build/run/UrlShortenerService.bat +++ b/build/run/UrlShortenerService.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.UrlShortener.Svc" -call dotnet run --project ..\..\common\services\ASC.UrlShortener.Svc\ASC.UrlShortener.Svc.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=urlshortener \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\services\urlshortener\service +set servicename=ASC.UrlShortener.Svc + +PUSHD %~dp0..\.. +set servicesource=%cd%\common\services\ASC.UrlShortener.Svc\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=urlshortener +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/WebApi.bat b/build/run/WebApi.bat index a46ed290bf..e0b34fde50 100644 --- a/build/run/WebApi.bat +++ b/build/run/WebApi.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Web.Api" -call dotnet run --project ..\..\web\ASC.Web.Api\ASC.Web.Api.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=api \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\studio\api +set servicename=ASC.Web.Api + +PUSHD %~dp0..\.. +set servicesource=%cd%\web\ASC.Web.Api\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=api +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/run/WebHealthChecksUI.bat b/build/run/WebHealthChecksUI.bat deleted file mode 100644 index 32976e10b8..0000000000 --- a/build/run/WebHealthChecksUI.bat +++ /dev/null @@ -1,2 +0,0 @@ -echo "RUN ASC.Web.HealthChecks.UI" -call dotnet run --project ..\..\web\ASC.Web.HealthChecks.UI\ASC.Web.HealthChecks.UI.csproj --no-build \ No newline at end of file diff --git a/build/run/WebStudio.bat b/build/run/WebStudio.bat index 01f39b5f6e..c933d98146 100644 --- a/build/run/WebStudio.bat +++ b/build/run/WebStudio.bat @@ -1,2 +1,15 @@ -echo "RUN ASC.Web.Studio" -call dotnet run --project ..\..\web\ASC.Web.Studio\ASC.Web.Studio.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=studio \ No newline at end of file +@echo off +PUSHD %~dp0.. +set servicepath=%cd%\deploy\studio\server\ +set servicename=ASC.Web.Studio + +PUSHD %~dp0..\.. +set servicesource=%cd%\web\ASC.Web.Studio\ + +if "%1%" == "service" ( + set servicepath=%servicepath%%servicename%.exe --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=studio +) else ( + if NOT "%1%" == "publish" ( + call %servicepath%%servicename%.exe + ) +) \ No newline at end of file diff --git a/build/start/restart.bat b/build/start/restart.bat index 9988cb4288..f454977936 100644 --- a/build/start/restart.bat +++ b/build/start/restart.bat @@ -2,13 +2,7 @@ PUSHD %~dp0.. call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( - for /R "run\" %%f in (*.bat) do ( - call nssm stop Onlyoffice%%~nf - ) - - for /R "run\" %%f in (*.bat) do ( - call nssm start Onlyoffice%%~nf - ) - - call iisreset + call stop.bat + call stop.bat + call iisreset ) diff --git a/build/start/start.bat b/build/start/start.bat index fa85473b4e..04a380025b 100644 --- a/build/start/start.bat +++ b/build/start/start.bat @@ -3,6 +3,6 @@ call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call nssm start Onlyoffice%%~nf + call sc start "Onlyoffice %%~nf" ) ) \ No newline at end of file diff --git a/build/start/stop.bat b/build/start/stop.bat index 15110ee419..9003b8ba0d 100644 --- a/build/start/stop.bat +++ b/build/start/stop.bat @@ -3,6 +3,6 @@ call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( for /R "run\" %%f in (*.bat) do ( - call nssm stop Onlyoffice%%~nf + call sc stop "Onlyoffice %%~nf" ) ) \ No newline at end of file