grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update script.

This commit is contained in:
Gav Wood 2016-02-19 11:57:04 +01:00
parent 4f6bff1c47
commit 33b649bb01
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
install-deps.sh
View File

@ -346,8 +346,7 @@ function run_installer()
exe brew install rocksdb exe brew install rocksdb
info "Installing multirust" info "Installing multirust"
exe brew install multirust exe brew install multirust
sudo multirust update nightly sudo multirust default beta
sudo multirust default nightly
echo echo
} }
@ -426,20 +425,20 @@ function run_installer()
depFound=$((depFound+1)) depFound=$((depFound+1))
check "multirust" check "multirust"
isMultirust=true isMultirust=true
if [[ $(multirust show-default 2>/dev/null | grep nightly | wc -l) == 4 ]]; then if [[ $(multirust show-default 2>/dev/null | grep beta | wc -l) == 4 ]]; then
depFound=$((depFound+1)) depFound=$((depFound+1))
check "rust nightly" check "rust beta"
isMultirustNightly=true isMultirustBeta=true
else else
uncheck "rust is not nightly" uncheck "rust is not beta"
isMultirustNightly=false isMultirustBeta=false
INSTALL_FILES+="${blue}${dim}==> multirust -> rust nightly:${reset}${n}" INSTALL_FILES+="${blue}${dim}==> multirust -> rust beta:${reset}${n}"
fi fi
else else
uncheck "multirust is missing" uncheck "multirust is missing"
uncheck "rust nightly is missing" uncheck "rust beta is missing"
isMultirust=false isMultirust=false
isMultirustNightly=false isMultirustBeta=false
INSTALL_FILES+="${blue}${dim}==> multirust:${reset}${n}" INSTALL_FILES+="${blue}${dim}==> multirust:${reset}${n}"
fi fi
} }
@ -626,10 +625,9 @@ function run_installer()
echo echo
fi fi
if [[ $isMultirustNightly == false ]]; then if [[ $isMultirustBeta == false ]]; then
info "Installing rust nightly..." info "Installing rust beta..."
multirust update nightly multirust default beta
multirust default nightly
echo echo
fi fi
} }
@ -660,7 +658,7 @@ function run_installer()
find_rocksdb find_rocksdb
find_multirust find_multirust
if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustNightly == false ]]; then if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustBeta == false ]]; then
abort_install abort_install
fi fi
fi fi