From d5ac24907e0e98329d2db0d982c035f9d2635c6d Mon Sep 17 00:00:00 2001
From: Eric Robitaille <eric@vianet.ca>
Date: Thu, 20 Nov 2014 14:25:26 -0500
Subject: Updated install.sh - github paths for executables

---
 install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index f6232af83..1f03f3f99 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ "$1" == "" ]; then
-	echo "Usage $0 executable branch ethereum develop"
+	echo "Usage $0 executable ethereum branch develop"
 	echo "executable    ethereum or mist"
 	echo "branch        develop or master"
 	exit
@@ -19,8 +19,8 @@ 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
+echo "go get -u -d github.com/ethereum/go-ethereum/cmd/$exe"
+go get -v -u -d github.com/ethereum/go-ethereum/cmd/$exe
 if [ $? != 0 ]; then
 	echo "go get failed"
 	exit
@@ -31,7 +31,7 @@ cd $GOPATH/src/github.com/ethereum/go-ethereum
 git checkout $branch
 
 echo "go-ethereum"
-cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe
+cd $GOPATH/src/github.com/ethereum/go-ethereum/cmd/$exe
 git checkout $branch
 
 if [ "$exe" == "mist" ]; then
-- 
cgit v1.2.3


From c0bbb7e69a0f34020f211061aaa842f1bbedb507 Mon Sep 17 00:00:00 2001
From: Eric Robitaille <eric@vianet.ca>
Date: Thu, 20 Nov 2014 15:02:24 -0500
Subject: fix for install script devel

---
 install.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 1f03f3f99..39212c3ed 100755
--- a/install.sh
+++ b/install.sh
@@ -1,14 +1,20 @@
 #!/bin/sh
 
 if [ "$1" == "" ]; then
-	echo "Usage $0 executable ethereum branch develop"
-	echo "executable    ethereum or mist"
-	echo "branch        develop or master"
+	echo "Usage $0 executable branch"
+	echo "executable    ethereum | mist"
+	echo "branch        develop | master"
 	exit
 fi
 
 exe=$1
 branch=$2
+branchPath=""
+
+# Set branchPath for develop as executables have moved
+if [ "$branch" == "develop" ]; then
+	branchPath="cmd/"
+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,8 +25,8 @@ if [ "$GOPATH" == "" ]; then
 	exit
 fi
 
-echo "go get -u -d github.com/ethereum/go-ethereum/cmd/$exe"
-go get -v -u -d github.com/ethereum/go-ethereum/cmd/$exe
+echo "go get -u -d github.com/ethereum/go-ethereum/$branchPath$exe"
+go get -v -u -d github.com/ethereum/go-ethereum/$branchPath$exe
 if [ $? != 0 ]; then
 	echo "go get failed"
 	exit
@@ -31,7 +37,7 @@ cd $GOPATH/src/github.com/ethereum/go-ethereum
 git checkout $branch
 
 echo "go-ethereum"
-cd $GOPATH/src/github.com/ethereum/go-ethereum/cmd/$exe
+cd $GOPATH/src/github.com/ethereum/go-ethereum/$branchPath$exe
 git checkout $branch
 
 if [ "$exe" == "mist" ]; then
-- 
cgit v1.2.3


From 6c098ee779393a85c5a70ba4494b9f22dec9a394 Mon Sep 17 00:00:00 2001
From: Eric Robitaille <eric@vianet.ca>
Date: Fri, 21 Nov 2014 00:06:33 -0500
Subject: changed install.sh to change branch and install executable

---
 install.sh | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 39212c3ed..0b2ee3df2 100755
--- a/install.sh
+++ b/install.sh
@@ -8,12 +8,11 @@ if [ "$1" == "" ]; then
 fi
 
 exe=$1
+path=$exe
 branch=$2
-branchPath=""
 
-# Set branchPath for develop as executables have moved
 if [ "$branch" == "develop" ]; then
-	branchPath="cmd/"
+	path="cmd/$exe"
 fi
 
 # Test if go is installed
@@ -25,20 +24,11 @@ if [ "$GOPATH" == "" ]; then
 	exit
 fi
 
-echo "go get -u -d github.com/ethereum/go-ethereum/$branchPath$exe"
-go get -v -u -d github.com/ethereum/go-ethereum/$branchPath$exe
-if [ $? != 0 ]; then
-	echo "go get failed"
-	exit
-fi
-
-echo "eth-go"
+echo "changing branch to $branch"
 cd $GOPATH/src/github.com/ethereum/go-ethereum
 git checkout $branch
 
-echo "go-ethereum"
-cd $GOPATH/src/github.com/ethereum/go-ethereum/$branchPath$exe
-git checkout $branch
+cd $GOPATH/src/github.com/ethereum/go-ethereum/$path
 
 if [ "$exe" == "mist" ]; then
 	echo "Building Mist GUI. Assuming Qt is installed. If this step"
@@ -48,9 +38,4 @@ else
 fi
 
 go install
-if [ $? == 0 ]; then
-	echo "go install failed"
-	exit
-fi
-
 echo "done. Please run $exe :-)"
-- 
cgit v1.2.3


From eba3fca7bcc18952c62689f96d600725b9d45402 Mon Sep 17 00:00:00 2001
From: Eric Robitaille <eric@vianet.ca>
Date: Fri, 21 Nov 2014 08:05:52 -0500
Subject: go get dependencies on executable

---
 install.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 0b2ee3df2..957306e75 100755
--- a/install.sh
+++ b/install.sh
@@ -28,6 +28,14 @@ echo "changing branch to $branch"
 cd $GOPATH/src/github.com/ethereum/go-ethereum
 git checkout $branch
 
+
+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
+
 cd $GOPATH/src/github.com/ethereum/go-ethereum/$path
 
 if [ "$exe" == "mist" ]; then
-- 
cgit v1.2.3


From 28b7dcc2041dfa945dc762f73f2524036517f328 Mon Sep 17 00:00:00 2001
From: Eric Robitaille <eric@vianet.ca>
Date: Fri, 21 Nov 2014 08:16:32 -0500
Subject: go get deps doesnt work with develop branch

---
 install.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 957306e75..30a3802e4 100755
--- a/install.sh
+++ b/install.sh
@@ -28,13 +28,17 @@ echo "changing branch to $branch"
 cd $GOPATH/src/github.com/ethereum/go-ethereum
 git checkout $branch
 
-
-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
+# 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 "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
 
 cd $GOPATH/src/github.com/ethereum/go-ethereum/$path
 
-- 
cgit v1.2.3