Merge branch 'release/v0.7.10'vv0.7.10

1 files changed, 24 insertions, 28 deletions

diff --git a/install.sh b/install.sh
index 9719a1afc..30a3802e4 100755
--- a/install.sh
+++ b/install.sh
@@ -1,15 +1,20 @@
 #!/bin/sh
 
 if [ "$1" == "" ]; then
-	echo "Usage $0 executable branch ethereum develop"
-	echo "executable    ethereum or ethereal"
-	echo "branch        develop or master"
+	echo "Usage $0 executable branch"
+	echo "executable    ethereum | mist"
+	echo "branch        develop | master"
 	exit
 fi
 
 exe=$1
+path=$exe
 branch=$2
 
+if [ "$branch" == "develop" ]; then
+	path="cmd/$exe"
+fi
+
 # Test if go is installed
 command -v go >/dev/null 2>&1 || { echo >&2 "Unable to find 'go'. This script requires go."; exit 1; }
 
@@ -19,39 +24,30 @@ if [ "$GOPATH" == "" ]; then
 	exit
 fi
 
-echo "go get -u -d github.com/ethereum/go-ethereum/$exe"
-go get -v -u -d github.com/ethereum/go-ethereum/$exe
-if [ $? != 0 ]; then
-	echo "go get failed"
-	exit
-fi
+echo "changing branch to $branch"
+cd $GOPATH/src/github.com/ethereum/go-ethereum
+git checkout $branch
 
-echo "serpent-go"
-cd $GOPATH/src/github.com/obscuren/serpent-go
+# installing package dependencies doesn't work for develop
+# branch as go get always pulls from master head
+# so build will continue to fail, but this installs locally
+# for people who git clone since go install will manage deps
 
-echo "init submodule"
-git submodule init
-git submodule update
+#echo "go get -u -d github.com/ethereum/go-ethereum/$path"
+#go get -v -u -d github.com/ethereum/go-ethereum/$path
+#if [ $? != 0 ]; then
+#	echo "go get failed"
+#	exit
+#fi
 
-echo "eth-go"
-cd $GOPATH/src/github.com/ethereum/eth-go
-git checkout $branch
+cd $GOPATH/src/github.com/ethereum/go-ethereum/$path
 
-echo "go-ethereum"
-cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe
-git checkout $branch
-
-if [ "$exe" == "ethereal" ]; then
-	echo "Building ethereal GUI. Assuming Qt is installed. If this step"
+if [ "$exe" == "mist" ]; then
+	echo "Building Mist GUI. Assuming Qt is installed. If this step"
 	echo "fails; please refer to: https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)"
 else
 	echo "Building ethereum CLI."
 fi
 
 go install
-if [ $? == 0 ]; then
-	echo "go install failed"
-	exit
-fi
-
 echo "done. Please run $exe :-)"