From 66342b1e157bd19e32bd1d7c940af04bea41447c Mon Sep 17 00:00:00 2001 From: debris Date: Wed, 3 Feb 2016 12:59:57 +0100 Subject: [PATCH] update install-deps.sh --- install-deps.sh | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index b10d373b7..848c25c6d 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -190,15 +190,15 @@ function run_installer() function find_eth() { - ETH_PATH=`which eth 2>/dev/null` + ETH_PATH=`which parity 2>/dev/null` if [[ -f $ETH_PATH ]] then - check "Found eth: $ETH_PATH" + check "Found parity: $ETH_PATH" echo "$($ETH_PATH -V)" isEth=true else - uncheck "Eth is missing" + uncheck "parity is missing" isEth=false fi } @@ -316,16 +316,22 @@ function run_installer() { osx_dependency_installer + info "Adding ethcore repository" + exe brew tap ethcore/ethcore git@github.com:ethcore/homebrew-ethcore.git + echo + info "Updating brew" exe brew update echo - info "Installing rocksdb" - exe brew install rocksdb - info "Installing multirust" - exe brew install multirust - sudo multirust update nightly - sudo multirust default nightly + info "Installing parity" + if [[ $isEth == true ]] + then + exe brew reinstall parity + else + exe brew install parity + exe brew linkapps parity + fi echo } @@ -395,6 +401,9 @@ function run_installer() sudo multirust update nightly sudo multirust default nightly echo + + info "Installing parity" + wget --quiet --output-document=- http://ethcore.io/download/parity.deb | dpkg --install - } function install() @@ -414,12 +423,12 @@ function run_installer() function verify_installation() { info "Verifying installation" -# find_eth + find_eth -# if [[ $isEth == false ]] -# then -# abortInstall -# fi + if [[ $isEth == false ]] + then + abortInstall + fi } function abortInstall() @@ -463,4 +472,4 @@ function run_installer() finish } -run_installer \ No newline at end of file +run_installer