From b9a6239ff6a1490c53a6eccf195bd60da7df6bcf Mon Sep 17 00:00:00 2001 From: NikitaZotov Date: Tue, 5 Mar 2024 20:22:22 +0300 Subject: [PATCH] scripts: set metasystem vars in the beginning of install --- scripts/build_problem_solver.sh | 9 --------- scripts/build_sc_web.sh | 9 --------- scripts/install_metasystem.sh | 6 ++++-- scripts/install_py_sc_server_deps.sh | 4 ---- scripts/run_py_sc_server.sh | 6 ------ scripts/run_sc_server.sh | 9 --------- scripts/run_sc_web.sh | 9 --------- 7 files changed, 4 insertions(+), 48 deletions(-) delete mode 100755 scripts/build_problem_solver.sh delete mode 100755 scripts/build_sc_web.sh delete mode 100755 scripts/install_py_sc_server_deps.sh delete mode 100755 scripts/run_py_sc_server.sh delete mode 100755 scripts/run_sc_server.sh delete mode 100755 scripts/run_sc_web.sh diff --git a/scripts/build_problem_solver.sh b/scripts/build_problem_solver.sh deleted file mode 100755 index 8139c967..00000000 --- a/scripts/build_problem_solver.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -if [ -z "${PLATFORM_PATH}" ]; -then - source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"/set_vars.sh -fi - -"${PLATFORM_PATH}/scripts/build_platform.sh" "$@" diff --git a/scripts/build_sc_web.sh b/scripts/build_sc_web.sh deleted file mode 100755 index 3a639c46..00000000 --- a/scripts/build_sc_web.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -if [ -z "${PLATFORM_PATH}" ]; -then - source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"/set_vars.sh -fi - -"${PLATFORM_PATH}/scripts/build_sc_web.sh" "$@" diff --git a/scripts/install_metasystem.sh b/scripts/install_metasystem.sh index 362b304e..85ca0820 100755 --- a/scripts/install_metasystem.sh +++ b/scripts/install_metasystem.sh @@ -4,11 +4,13 @@ set -eo pipefail CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) source "${CURRENT_DIR}/formats.sh" -stage "Install OSTIS Platform" - METASYSTEM_PATH="${CURRENT_DIR}/.." cd "${METASYSTEM_PATH}" && git submodule update --init --recursive +source "${CURRENT_DIR}/set_vars.sh" + +stage "Install OSTIS Platform" + "${PLATFORM_PATH}/scripts/install_submodules.sh" "${PLATFORM_PATH}/scripts/install_dependencies.sh" "${PLATFORM_PATH}/scripts/build_platform.sh" diff --git a/scripts/install_py_sc_server_deps.sh b/scripts/install_py_sc_server_deps.sh deleted file mode 100755 index 86f57c99..00000000 --- a/scripts/install_py_sc_server_deps.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)/set_vars.sh" - -pip3 install -r "$METASYSTEM_PATH/platform-dependent-components/problem-solver/py/requirements.txt" diff --git a/scripts/run_py_sc_server.sh b/scripts/run_py_sc_server.sh deleted file mode 100755 index 06b70f9a..00000000 --- a/scripts/run_py_sc_server.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)/set_vars.sh" - -python3 "$METASYSTEM_PATH"/platform-dependent-components/problem-solver/py/server.py "$@" diff --git a/scripts/run_sc_server.sh b/scripts/run_sc_server.sh deleted file mode 100755 index c7d1fda2..00000000 --- a/scripts/run_sc_server.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -if [ -z "${PLATFORM_PATH}" ]; -then - source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"/set_vars.sh -fi - -"${PLATFORM_PATH}/scripts/run_sc_server.sh" "$@" diff --git a/scripts/run_sc_web.sh b/scripts/run_sc_web.sh deleted file mode 100755 index 5cb29f7e..00000000 --- a/scripts/run_sc_web.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -if [ -z "${PLATFORM_PATH}" ]; -then - source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"/set_vars.sh -fi - -"${PLATFORM_PATH}/scripts/run_sc_web.sh" "$@"