From dedb8cf3b32ba1c861a2dcb63255491a9205803f Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Mon, 2 Oct 2023 16:52:30 +0400
Subject: [PATCH] Updated paths and permissions

---
 .gitignore                          |  1 +
 build.backend.docker.sh             |  0
 build.sh                            |  0
 clear.backend.docker.sh             |  0
 install/common/build-services.sh    | 14 +++++++-------
 install/docker/Dockerfile.runtime   |  2 +-
 run.translations.spellcheck.test.sh |  0
 run.translations.tests.sh           |  0
 runMigrations.sh                    |  0
 9 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore
 mode change 100644 => 100755 build.backend.docker.sh
 mode change 100644 => 100755 build.sh
 mode change 100644 => 100755 clear.backend.docker.sh
 mode change 100644 => 100755 run.translations.spellcheck.test.sh
 mode change 100644 => 100755 run.translations.tests.sh
 mode change 100644 => 100755 runMigrations.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..e43b0f9889
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/build.backend.docker.sh b/build.backend.docker.sh
old mode 100644
new mode 100755
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
diff --git a/clear.backend.docker.sh b/clear.backend.docker.sh
old mode 100644
new mode 100755
diff --git a/install/common/build-services.sh b/install/common/build-services.sh
index 870c45eeca..458c11d6a1 100644
--- a/install/common/build-services.sh
+++ b/install/common/build-services.sh
@@ -123,10 +123,10 @@ function build_dotnetcore_backend {
   if [[ ${BUILD_DOTNET_CORE_ARGS} == "false" ]]
   then
     echo "== Build ASC.Web.slnf =="
-    dotnet build ASC.Web.slnf
+    dotnet build server/ASC.Web.slnf
   else
     echo "== Build ASC.Web.slnf ${BUILD_DOTNET_CORE_ARGS} =="
-    dotnet build ASC.Web.slnf ${BUILD_DOTNET_CORE_ARGS}
+    dotnet build server/ASC.Web.slnf ${BUILD_DOTNET_CORE_ARGS}
   fi
   
   if [[ $# -gt 0 ]]
@@ -135,7 +135,7 @@ function build_dotnetcore_backend {
     if [[ ${migration_check} == "true" ]]
     then
       echo "== Build ASC.Migrations.sln =="
-      dotnet build ASC.Migrations.sln -o ${BUILD_PATH}/services/ASC.Migration.Runner/service/
+      dotnet build server/ASC.Migrations.sln -o ${BUILD_PATH}/services/ASC.Migration.Runner/service/
     fi
     if [[ ${DOCKER_ENTRYPOINT} != "false" ]]
     then
@@ -154,9 +154,9 @@ function backend-dotnet-publish {
 
   if [[ ${PUBLISH_BACKEND_ARGS} == "false" ]]
   then
-    dotnet publish $SRC_PATH/ASC.Web.slnf -p "PublishProfile=FolderProfile"
+    dotnet publish $SRC_PATH/server/ASC.Web.slnf -p "PublishProfile=FolderProfile"
   else
-    dotnet publish $SRC_PATH/ASC.Web.slnf ${PUBLISH_BACKEND_ARGS} -p "PublishProfile=FolderProfile"
+    dotnet publish $SRC_PATH/server/ASC.Web.slnf ${PUBLISH_BACKEND_ARGS} -p "PublishProfile=FolderProfile"
   fi
 
   if [[ ${DOCKER_ENTRYPOINT} != "false" ]]
@@ -176,9 +176,9 @@ function backend-nodejs-publish {
   get_services_name "${BACKEND_NODEJS_SERVICES}"
   for i in ${!ARRAY_NAME_SERVICES[@]}; do
     echo "== Build ${ARRAY_NAME_SERVICES[$i]} project =="
-    yarn install --cwd ${SRC_PATH}/common/${ARRAY_NAME_SERVICES[$i]} --frozen-lockfile && \
+    yarn install --cwd ${SRC_PATH}/server/common/${ARRAY_NAME_SERVICES[$i]} && \
     mkdir -p ${BUILD_PATH}/services/${ARRAY_NAME_SERVICES[$i]}/service/ && \
-    cp -rfv ${SRC_PATH}/common/${ARRAY_NAME_SERVICES[$i]}/* ${BUILD_PATH}/services/${ARRAY_NAME_SERVICES[$i]}/service/
+    cp -rfv ${SRC_PATH}/server/common/${ARRAY_NAME_SERVICES[$i]}/* ${BUILD_PATH}/services/${ARRAY_NAME_SERVICES[$i]}/service/
     if [[ ${DOCKER_ENTRYPOINT} != "false" ]]
     then
        echo "== ADD ${DOCKER_ENTRYPOINT} to ${ARRAY_NAME_SERVICES[$i]} =="
diff --git a/install/docker/Dockerfile.runtime b/install/docker/Dockerfile.runtime
index b10fa0aa6d..193b122874 100644
--- a/install/docker/Dockerfile.runtime
+++ b/install/docker/Dockerfile.runtime
@@ -9,7 +9,7 @@ ARG BUILD_PATH
 
 WORKDIR ${SRC_PATH}
 
-COPY  /config ./config
+COPY  build/config ./config
 
 RUN find config/ -maxdepth 1 -name "*.json" | grep -v test | grep -v dev | xargs tar -cvf config.tar && \
     tar -C "/app/onlyoffice/" -xvf config.tar && \
diff --git a/run.translations.spellcheck.test.sh b/run.translations.spellcheck.test.sh
old mode 100644
new mode 100755
diff --git a/run.translations.tests.sh b/run.translations.tests.sh
old mode 100644
new mode 100755
diff --git a/runMigrations.sh b/runMigrations.sh
old mode 100644
new mode 100755