From 2aa41700705a237c2fd4c040790a0abd6f8a5965 Mon Sep 17 00:00:00 2001 From: phahulin Date: Wed, 29 Nov 2017 19:12:27 +0300 Subject: [PATCH] Merge latest changes --- nodes/owner/install.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nodes/owner/install.sh b/nodes/owner/install.sh index ab6e233..e698482 100644 --- a/nodes/owner/install.sh +++ b/nodes/owner/install.sh @@ -83,13 +83,19 @@ EOF echo "<===== pull_image_and_configs" } -download_initial_keys_script() { - echo "=====> download_initial_keys_script" - git clone -b ${IKEYS_BRANCH} --single-branch https://github.com/${MAIN_REPO_FETCH}/oracles-initial-keys - cd oracles-initial-keys - npm install +install_scripts() { + echo "=====> install_scripts" + git clone -b ${SCRIPTS_OWNER_BRANCH} --single-branch "${SCRIPTS_OWNER_REPO}" + SCRIPTS_OWNER_FOLDER="$(basename ${SCRIPTS_OWNER_REPO})" + cd "${SCRIPTS_OWNER_FOLDER}" + cd generateInitialKey + npm install + cd .. + cd joinContracts + npm install + cd .. cd .. - echo "<===== download_initial_keys_script" + echo "<===== install_scripts" } # MAIN @@ -120,7 +126,7 @@ main () { configure_logrotate - download_initial_keys_script + install_scripts } main