From 8dd51113287b8dc3041e2204953d065025e58ff2 Mon Sep 17 00:00:00 2001 From: Mikhail Yumanov Date: Sat, 13 Mar 2021 06:03:51 +0300 Subject: [PATCH] CST-10 znick#336 some tuning --- deploy_local_beta/deploy_local_beta.sh | 42 +++++++------------ .../deploy_local_beta_python2.sh | 1 - 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/deploy_local_beta/deploy_local_beta.sh b/deploy_local_beta/deploy_local_beta.sh index 681334735..dff364cee 100644 --- a/deploy_local_beta/deploy_local_beta.sh +++ b/deploy_local_beta/deploy_local_beta.sh @@ -8,36 +8,24 @@ then echo "Execute \`. deploy_local_beta/run.sh\` from repository root instead." else + # GIT SUBMODULES + ################ - # CHECK PYTHON PATH - ################### + ANYBETA_report + ANYBETA_report "Init submodules" + git submodule init + git submodule update -# if ! test -e $ANYBETA_PYTHON_PATH -# then -# ANYBETA_error "Bad python path: $ANYBETA_PYTHON_PATH" -# else + # CHOOSE RIGHT VERSION + ###################### + ANYBETA_PYTHON_VERSION_CHECK="from __future__ import print_function; import sys; print(int(sys.version_info < (3, 3)))" - # CLONE REPOSITORY - ################## - - ANYBETA_report - ANYBETA_report "Init submodules" - git submodule init - git submodule update - - - # CHOOSE RIGHT VERSION - ###################### - - ANYBETA_PYTHON_VERSION_CHECK="from __future__ import print_function; import sys; print(int(sys.version_info < (3, 3)))" - - if test `$ANYBETA_PYTHON_PATH -c "$ANYBETA_PYTHON_VERSION_CHECK"` -eq 1 - then - . $ANYBETA_DEPLOY/deploy_local_beta_python2.sh - else - . $ANYBETA_DEPLOY/deploy_local_beta_python3.sh - fi - + if test `$ANYBETA_PYTHON_PATH -c "$ANYBETA_PYTHON_VERSION_CHECK"` -eq 1 + then + . $ANYBETA_DEPLOY/deploy_local_beta_python2.sh + else + . $ANYBETA_DEPLOY/deploy_local_beta_python3.sh + fi fi diff --git a/deploy_local_beta/deploy_local_beta_python2.sh b/deploy_local_beta/deploy_local_beta_python2.sh index b9c729166..b3143900f 100644 --- a/deploy_local_beta/deploy_local_beta_python2.sh +++ b/deploy_local_beta/deploy_local_beta_python2.sh @@ -14,7 +14,6 @@ else ANYBETA_report ANYBETA_report "Enable virtualenv" - virtualenv -p $ANYBETA_PYTHON_PATH $ANYBETA_VENV_NAME ANYBETA_activate