status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

`setup` script updates: wget installation; updated Android SDK installer 

Signed-off-by: Goran Jovic <goranjovic@gmail.com>
This commit is contained in:
Aleksandr Pantiukhov 2018-07-30 21:44:44 +02:00 committed by Goran Jovic
parent ad5eff54d2
commit 4a1c8e11a3
No known key found for this signature in database
GPG Key ID: D429D1A9B2EB8A8E
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/lib/setup/installers.sh
View File

@ -37,6 +37,13 @@ function install_and_setup_package_manager() {
fi fi
} }
function install_wget() {
if is_macos; then
brew_install wget
fi
// it's installed on ubuntu/debian by default
}
function needs_java8_linux() { function needs_java8_linux() {
! program_exists "java" || !(java -version 2>&1 | grep -q "1.8.0") ! program_exists "java" || !(java -version 2>&1 | grep -q "1.8.0")
} }
@ -296,16 +303,13 @@ function dependency_setup() {
} }
function use_android_sdk() { function use_android_sdk() {
if [ -n "$ANDROID_SDK" ]; then if [ -n "$ANDROID_SDK_ROOT" ]; then
if ! grep -Fq "sdk.dir" $_localPropertiesPath; 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 fi
else else
local _docUrl="https://docs.status.im/docs/build_status_linux.html" local _docUrl="https://docs.status.im/docs/build_status.html"
if is_macos; then cecho "@yellow[[ANDROID_SDK_ROOT environment variable not defined, please install the Android SDK.]]"
_docUrl="https://docs.status.im/docs/build_status_osx.html"
fi
cecho "@yellow[[ANDROID_SDK environment variable not defined, please install the Android SDK.]]"
cecho "@yellow[[(see $_docUrl).]]" cecho "@yellow[[(see $_docUrl).]]"
echo echo

1
scripts/setup
View File

@ -24,6 +24,7 @@ load_rvm_if_available
setup_header "Installing requirements..." setup_header "Installing requirements..."
install_and_setup_package_manager install_and_setup_package_manager
install_wget
install_java8 install_java8
install_clojure_cli install_clojure_cli
install_leiningen install_leiningen