Skip to content

Commit

Permalink
Review fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
NikitaZotov committed Apr 15, 2024
1 parent ec9d043 commit 5b6fbbc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
5 changes: 0 additions & 5 deletions scripts/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 17 additions & 0 deletions scripts/install_minimal_dependencies.sh
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion scripts/install_minimal_metasystem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_minimal_submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5b6fbbc

Please sign in to comment.