From 4a1c8e11a35921cd04765071bd620c4834912452 Mon Sep 17 00:00:00 2001 From: Aleksandr Pantiukhov Date: Mon, 30 Jul 2018 21:44:44 +0200 Subject: [PATCH] `setup` script updates: wget installation; updated Android SDK installer Signed-off-by: Goran Jovic --- scripts/lib/setup/installers.sh | 18 +++++++++++------- scripts/setup | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/lib/setup/installers.sh b/scripts/lib/setup/installers.sh index df5230ab43..a497a6f932 100755 --- a/scripts/lib/setup/installers.sh +++ b/scripts/lib/setup/installers.sh @@ -37,6 +37,13 @@ function install_and_setup_package_manager() { fi } +function install_wget() { + if is_macos; then + brew_install wget + fi + // it's installed on ubuntu/debian by default +} + function needs_java8_linux() { ! program_exists "java" || !(java -version 2>&1 | grep -q "1.8.0") } @@ -296,16 +303,13 @@ function dependency_setup() { } function use_android_sdk() { - if [ -n "$ANDROID_SDK" ]; then + if [ -n "$ANDROID_SDK_ROOT" ]; then if ! grep -Fq "sdk.dir" $_localPropertiesPath; then - echo "sdk.dir=$ANDROID_SDK" | tee -a $_localPropertiesPath + echo "sdk.dir=$ANDROID_SDK_ROOT" | tee -a $_localPropertiesPath fi else - local _docUrl="https://docs.status.im/docs/build_status_linux.html" - if is_macos; then - _docUrl="https://docs.status.im/docs/build_status_osx.html" - fi - cecho "@yellow[[ANDROID_SDK environment variable not defined, please install the Android SDK.]]" + local _docUrl="https://docs.status.im/docs/build_status.html" + cecho "@yellow[[ANDROID_SDK_ROOT environment variable not defined, please install the Android SDK.]]" cecho "@yellow[[(see $_docUrl).]]" echo diff --git a/scripts/setup b/scripts/setup index 532c9a8730..f93d105cd4 100755 --- a/scripts/setup +++ b/scripts/setup @@ -24,6 +24,7 @@ load_rvm_if_available setup_header "Installing requirements..." install_and_setup_package_manager +install_wget install_java8 install_clojure_cli install_leiningen