ostis-ai · NikitaZotov · Feb 13, 2024 · Feb 12, 2024 · Feb 12, 2024 · Feb 12, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,10 @@
-kb.bin
 sc-machine
+sc-component-manager
 scp-machine
 sc-web
-ims.ostis.kb_copy
-geometry.drawings
-web-scn-editor
-prepared_kb
+ims.ostis.kb
+
+kb.bin
 bin
 build
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -8,8 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Scripts `update_submodules.sh`
 - Add sc-component-manager
 
+### Changed
+
+- Separate installation and update submodules scripts
+
+### Deprecated
+
+- Option `--update` in `install_submodules.sh`
+
 ## [0.9.0-Unlock] - 22.01.2024
 
 ### Changes

diff --git a/scripts/clone_update_submodule.sh b/scripts/clone_update_submodule.sh
diff --git a/scripts/formats.sh b/scripts/formats.sh
@@ -1,4 +1,9 @@
 stage()
 {
-  ([ -n "$(tput setaf 1 2<&-)" ] && { tput setaf 4 && tput bold && echo "$1" && tput sgr0; }) || echo "$1"
+  ([ -n "$(tput setaf 1 2<&-)" ] && { tput setaf 4 && tput bold && echo "$1" && tput sgr0; }) || echo "$@"
+}
+
+warning()
+{
+  ([ -n "$(tput setaf 1 2<&-)" ] && { tput setaf 3 && tput bold && echo "$1" && tput sgr0; }) || echo "$@"
 }
diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
-source "${CURRENT_DIR}/formats.sh"
+SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+source "${SCRIPTS_DIR}/formats.sh"
 
 if [[ -z "${SC_MACHINE_PATH}" || -z "${SC_WEB_PATH}" ]];
 then
-  source "${CURRENT_DIR}/set_vars.sh"
+  source "${SCRIPTS_DIR}/set_vars.sh"
 fi
 
 function usage() {
@@ -22,7 +22,8 @@ USAGE
 stage "Install dependencies"
 
 args=()
-while [ "$1" != "" ]; do
+while [ "$1" != "" ];
+do
   case $1 in
   --dev)
     args+=("--dev")
@@ -38,7 +39,7 @@ while [ "$1" != "" ]; do
   shift 1 # remove the current value for `$1` and use the next
 done
 
-"${PLATFORM_PATH}/scripts/install_sc_machine_dependencies.sh" "${args[@]}"
-"${PLATFORM_PATH}/scripts/install_sc_web_dependencies.sh" "${args[@]}"
+"${SCRIPTS_DIR}/install_sc_machine_dependencies.sh" "${args[@]}"
+"${SCRIPTS_DIR}/install_sc_web_dependencies.sh" "${args[@]}"
 
 stage "Dependencies installed successfully"
diff --git a/scripts/install_ims_kb_submodule.sh b/scripts/install_ims_kb_submodule.sh
diff --git a/scripts/install_platform.sh b/scripts/install_platform.sh
@@ -1,20 +1,15 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
-source "${CURRENT_DIR}/formats.sh"
-
-if [[ -z "${SC_MACHINE_PATH}" || -z "${SC_WEB_PATH}" ]];
-then
-  source "${CURRENT_DIR}/set_vars.sh"
-fi
+SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+source "${SCRIPTS_DIR}/formats.sh"
 
 stage "Install ostis-web-platform"
 
-"${PLATFORM_PATH}/scripts/install_submodules.sh"
-"${PLATFORM_PATH}/scripts/install_dependencies.sh" --dev
-"${PLATFORM_PATH}/scripts/build_sc_machine.sh"
-"${PLATFORM_PATH}/scripts/build_sc_web.sh"
-"${PLATFORM_PATH}/scripts/build_kb.sh"
+"${SCRIPTS_DIR}/install_submodules.sh"
+"${SCRIPTS_DIR}/install_dependencies.sh" --dev
+"${SCRIPTS_DIR}/build_sc_machine.sh"
+"${SCRIPTS_DIR}/build_sc_web.sh"
+"${SCRIPTS_DIR}/build_kb.sh"
 
 stage "OSTIS-web-platform installed successfully"
diff --git a/scripts/install_platform_with_component_manager.sh b/scripts/install_platform_with_component_manager.sh
@@ -1,21 +1,17 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
-source "${CURRENT_DIR}/formats.sh"
-
-if [ -z "${SC_MACHINE_PATH}" ];
-then
-  source "${CURRENT_DIR}/set_vars.sh"
-fi
+SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+SUBMODULE_SCRIPTS_DIR="${SCRIPTS_DIR}/submodule-scripts"
+source "${SCRIPTS_DIR}/formats.sh"
 
 stage "Install ostis-web-platform"
 
-"${PLATFORM_PATH}/scripts/install_sc_machine_submodule.sh"
-"${PLATFORM_PATH}/scripts/install_sc_machine_dependencies.sh" --dev
-"${PLATFORM_PATH}/scripts/install_sc_component_manager_submodule.sh"
-"${PLATFORM_PATH}/scripts/build_sc_machine.sh"
-"${PLATFORM_PATH}/scripts/build_sc_component_manager.sh"
-"${PLATFORM_PATH}/scripts/build_kb.sh"
+"${SUBMODULE_SCRIPTS_DIR}/install_sc_machine.sh"
+"${SCRIPTS_DIR}/install_sc_machine_dependencies.sh" --dev
+"${SUBMODULE_SCRIPTS_DIR}/install_sc_component_manager.sh"
+"${SCRIPTS_DIR}/build_sc_machine.sh"
+"${SCRIPTS_DIR}/build_sc_component_manager.sh"
+"${SCRIPTS_DIR}/build_kb.sh"
 
 stage "OSTIS-web-platform installed successfully"
diff --git a/scripts/install_sc_component_manager_submodule.sh b/scripts/install_sc_component_manager_submodule.sh
diff --git a/scripts/install_sc_machine_dependencies.sh b/scripts/install_sc_machine_dependencies.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
-source "${CURRENT_DIR}/formats.sh"
+SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+source "${SCRIPTS_DIR}/formats.sh"
 
 if [ -z "${SC_MACHINE_PATH}" ];
 then
-  source "${CURRENT_DIR}/set_vars.sh"
+  source "${SCRIPTS_DIR}/set_vars.sh"
 fi
 
 stage "Install sc-machine dependencies"

diff --git a/scripts/install_sc_machine_submodule.sh b/scripts/install_sc_machine_submodule.sh
diff --git a/scripts/install_sc_web_dependencies.sh b/scripts/install_sc_web_dependencies.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
-source "${CURRENT_DIR}/formats.sh"
+SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+source "${SCRIPTS_DIR}/formats.sh"
 
 if [ -z "${SC_WEB_PATH}" ];
 then
-  source "${CURRENT_DIR}/set_vars.sh"
+  source "${SCRIPTS_DIR}/set_vars.sh"
 fi
 
 stage "Install sc-web dependencies"

diff --git a/scripts/install_sc_web_submodule.sh b/scripts/install_sc_web_submodule.sh
diff --git a/scripts/install_submodules.sh b/scripts/install_submodules.sh
@@ -1,18 +1,15 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
-source "${CURRENT_DIR}/formats.sh"
+SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+SUBMODULE_SCRIPTS_DIR="${SCRIPTS_DIR}/submodule-scripts"
+source "${SCRIPTS_DIR}/formats.sh"
 
-if [[ -z "${PLATFORM_PATH}" || -z "${SC_MACHINE_PATH}" || -z "${SC_WEB_PATH}" || -z "${SC_COMPONENT_MANAGER_PATH}" \
-  || -z "${SC_MACHINE_REPO}" || -z "${SC_WEB_REPO}" || -z "${SC_COMPONENT_MANAGER_REPO}" \
-  || -z "${SC_MACHINE_BRANCH}" || -z "${SC_WEB_BRANCH}" || -z "${SC_COMPONENT_MANAGER_BRANCH}" \
-  || -z "${SC_MACHINE_COMMIT}" || -z "${SC_WEB_COMMIT}" || -z "${SC_COMPONENT_MANAGER_COMMIT}" ]];
+if [[ -z "${PLATFORM_PATH}" ]];
 then
-  source "${CURRENT_DIR}/set_vars.sh"
+  source "${SCRIPTS_DIR}/set_vars.sh"
 fi
 
-
 usage() {
   cat <<USAGE
 Usage: $0 [--update]
@@ -26,26 +23,38 @@ USAGE
   exit 1
 }
 
+UPDATE=0
+
 while [ "$1" != "" ];
 do
   case $1 in
     "--help" | "-h" )
       usage
       ;;
+    "--update" )
+      UPDATE=1
+      ;;
     * )
       usage
       ;;
   esac
   shift 1
 done
 
-stage "Clone submodules"
+if (( UPDATE == 1 ));
+then
+  warning "The option \"--update\" is deprecated. Use \"update_submodules.sh\" instead."
+
+  "${SCRIPTS_DIR}/update_submodules.sh"
+else
+  stage "Clone submodules"
 
-cd "${PLATFORM_PATH}" && git submodule update --init --recursive
+  cd "${PLATFORM_PATH}" && git submodule update --init --recursive
 
-"${PLATFORM_PATH}/scripts/install_sc_machine_submodule.sh" "$@"
-"${PLATFORM_PATH}/scripts/install_sc_component_manager_submodule.sh" "$@"
-"${PLATFORM_PATH}/scripts/install_sc_web_submodule.sh" "$@"
-"${PLATFORM_PATH}/scripts/install_ims_kb_submodule.sh" "$@"
+  "${SUBMODULE_SCRIPTS_DIR}/install_sc_machine.sh"
+  "${SUBMODULE_SCRIPTS_DIR}/install_sc_component_manager.sh"
+  "${SUBMODULE_SCRIPTS_DIR}/install_sc_web.sh"
+  "${SUBMODULE_SCRIPTS_DIR}/install_ims_ostis_kb.sh"
 
-stage "Submodules cloned successfully"
+  stage "Submodules cloned successfully"
+fi
diff --git a/scripts/submodule-scripts/install_ims_ostis_kb.sh b/scripts/submodule-scripts/install_ims_ostis_kb.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+SUBMODULE_SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+UTILS_DIR="${SUBMODULE_SCRIPTS_DIR}/utils"
+
+if [[ -z "${IMS_KB_REPO}" || -z "${IMS_KB_PATH}" || -z "${IMS_KB_BRANCH}" || -z "${IMS_KB_COMMIT}" ]];
+then
+  source "${SUBMODULE_SCRIPTS_DIR}/../set_vars.sh"
+fi
+
+"${UTILS_DIR}/install_submodule.sh" --repo "${IMS_KB_REPO}" --path "${IMS_KB_PATH}" --branch "${IMS_KB_BRANCH}" --commit "${IMS_KB_COMMIT}"
diff --git a/scripts/submodule-scripts/install_sc_component_manager.sh b/scripts/submodule-scripts/install_sc_component_manager.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+SUBMODULE_SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+UTILS_DIR="${SUBMODULE_SCRIPTS_DIR}/utils"
+
+if [[ -z "${SC_COMPONENT_MANAGER_REPO}" || -z "${SC_COMPONENT_MANAGER_PATH}" || -z "${SC_COMPONENT_MANAGER_BRANCH}" || -z "${SC_COMPONENT_MANAGER_COMMIT}" ]];
+then
+  source "${SUBMODULE_SCRIPTS_DIR}/../set_vars.sh"
+fi
+
+"${UTILS_DIR}/install_submodule.sh" --repo "${SC_COMPONENT_MANAGER_REPO}" --path "${SC_COMPONENT_MANAGER_PATH}" --branch "${SC_COMPONENT_MANAGER_BRANCH}" --commit "${SC_COMPONENT_MANAGER_COMMIT}"
diff --git a/scripts/submodule-scripts/install_sc_machine.sh b/scripts/submodule-scripts/install_sc_machine.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+SUBMODULE_SCRIPTS_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
+UTILS_DIR="${SUBMODULE_SCRIPTS_DIR}/utils"
+
+if [[ -z "${SC_MACHINE_REPO}" || -z "${SC_MACHINE_PATH}" || -z "${SC_MACHINE_BRANCH}" || -z "${SC_MACHINE_COMMIT}" ]];
+then
+  source "${SUBMODULE_SCRIPTS_DIR}/../set_vars.sh"
+fi
+
+"${UTILS_DIR}/install_submodule.sh" --repo "${SC_MACHINE_REPO}" --path "${SC_MACHINE_PATH}" --branch "${SC_MACHINE_BRANCH}" --commit "${SC_MACHINE_COMMIT}"