From 5b6fbbc794e8a10e8819a0924d74714ef5225e09 Mon Sep 17 00:00:00 2001 From: NikitaZotov Date: Mon, 15 Apr 2024 09:08:09 +0300 Subject: [PATCH] Review fixes --- scripts/install_dependencies.sh | 5 ----- scripts/install_minimal_dependencies.sh | 17 +++++++++++++++++ scripts/install_minimal_metasystem.sh | 2 +- scripts/install_minimal_submodules.sh | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100755 scripts/install_minimal_dependencies.sh diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh index 0fe235bb..f9be4b2a 100755 --- a/scripts/install_dependencies.sh +++ b/scripts/install_dependencies.sh @@ -5,11 +5,6 @@ CURRENT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)" OSTIS_SCRIPTS_DIR="${CURRENT_DIR}/ostis-scripts" source "${OSTIS_SCRIPTS_DIR}/message-scripts/messages.sh" -if [[ -z "${SC_MACHINE_PATH}" || -z "${SC_WEB_PATH}" ]]; -then - source "${CURRENT_DIR}/set_vars.sh" -fi - "${CURRENT_DIR}/install_platform_dependencies.sh" "$@" "${CURRENT_DIR}/install_react_sc_web_dependencies.sh" "${CURRENT_DIR}/install_py_ps_dependencies.sh" diff --git a/scripts/install_minimal_dependencies.sh b/scripts/install_minimal_dependencies.sh new file mode 100755 index 00000000..16d815f6 --- /dev/null +++ b/scripts/install_minimal_dependencies.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -eo pipefail + +CURRENT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)" +OSTIS_SCRIPTS_DIR="${CURRENT_DIR}/ostis-scripts" +source "${OSTIS_SCRIPTS_DIR}/message-scripts/messages.sh" + +if [[ -z "${PLATFORM_PATH}" ]]; +then + source "${CURRENT_DIR}/set_vars.sh" +fi + +"${PLATFORM_PATH}/scripts/install_sc_machine_dependencies.sh" "$@" +"${CURRENT_DIR}/install_react_sc_web_dependencies.sh" +"${CURRENT_DIR}/install_py_ps_dependencies.sh" + +info "Dependencies installed successfully" diff --git a/scripts/install_minimal_metasystem.sh b/scripts/install_minimal_metasystem.sh index 1ca62ba0..fabc9b53 100755 --- a/scripts/install_minimal_metasystem.sh +++ b/scripts/install_minimal_metasystem.sh @@ -8,7 +8,7 @@ source "${OSTIS_SCRIPTS_DIR}/message-scripts/messages.sh" info "Install ostis-metasystem" "${CURRENT_DIR}/install_minimal_submodules.sh" -"${CURRENT_DIR}/install_dependencies.sh" +"${CURRENT_DIR}/install_minimal_dependencies.sh" --dev "${CURRENT_DIR}/build_platform.sh" "${CURRENT_DIR}/build_ps.sh" "${CURRENT_DIR}/build_kb.sh" diff --git a/scripts/install_minimal_submodules.sh b/scripts/install_minimal_submodules.sh index 951ceefc..afbd7d45 100755 --- a/scripts/install_minimal_submodules.sh +++ b/scripts/install_minimal_submodules.sh @@ -5,7 +5,7 @@ CURRENT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)" OSTIS_SCRIPTS_DIR="${CURRENT_DIR}/ostis-scripts" source "${OSTIS_SCRIPTS_DIR}/message-scripts/messages.sh" -SUBMODULE_SCRIPTS_DIR="${SCRIPTS_DIR}/submodule-scripts" +SUBMODULE_SCRIPTS_DIR="${CURRENT_DIR}/submodule-scripts" if [[ -z "${METASYSTEM_PATH}" ]]; then