From d20693fb16ad79c8313f6e590d187c9fb22f0d92 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Wed, 17 Oct 2018 20:47:56 +0400
Subject: [PATCH] install scripts: update go version, remove upgrade cmd
 (#2650)

* [install scripts] update go version, remove upgrade

- upgrading OS is out of scope of installation scripts

* add missing log statement

Refs https://github.com/tendermint/tendermint/pull/2642#discussion_r225786794
---
 consensus/state_test.go                      |  2 ++
 scripts/install/install_tendermint_bsd.sh    | 11 +++++------
 scripts/install/install_tendermint_ubuntu.sh | 10 ++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/consensus/state_test.go b/consensus/state_test.go
index c4fc11c3d..83c4bb142 100644
--- a/consensus/state_test.go
+++ b/consensus/state_test.go
@@ -949,6 +949,8 @@ func TestProposeValidBlock(t *testing.T) {
 	round = round + 2 // moving to the next round
 
 	ensureNewRound(newRoundCh, height, round)
+	t.Log("### ONTO ROUND 3")
+
 	ensureNewTimeout(timeoutWaitCh, height, round, cs1.config.TimeoutPrecommit.Nanoseconds())
 
 	round = round + 1 // moving to the next round
diff --git a/scripts/install/install_tendermint_bsd.sh b/scripts/install/install_tendermint_bsd.sh
index aba584f2e..5b30eab31 100644
--- a/scripts/install/install_tendermint_bsd.sh
+++ b/scripts/install/install_tendermint_bsd.sh
@@ -17,16 +17,15 @@ set BRANCH=master
 
 sudo pkg update
 
-sudo pkg upgrade -y
 sudo pkg install -y gmake
 sudo pkg install -y git
 
 # get and unpack golang
-curl -O https://storage.googleapis.com/golang/go1.10.freebsd-amd64.tar.gz
-tar -xvf go1.10.freebsd-amd64.tar.gz
+curl -O https://storage.googleapis.com/golang/go1.11.freebsd-amd64.tar.gz
+tar -xvf go1.11.freebsd-amd64.tar.gz
 
-# move go binary and add to path
-mv go /usr/local
+# move go folder and add go binary to path
+sudo mv go /usr/local
 set path=($path /usr/local/go/bin)
 
 
@@ -41,7 +40,7 @@ source ~/.tcshrc
 # get the code and move into repo
 set REPO=github.com/tendermint/tendermint
 go get $REPO
-cd $GOPATH/src/$REPO
+cd "$GOPATH/src/$REPO"
 
 # build & install master
 git checkout $BRANCH
diff --git a/scripts/install/install_tendermint_ubuntu.sh b/scripts/install/install_tendermint_ubuntu.sh
index b9605de07..29e975088 100644
--- a/scripts/install/install_tendermint_ubuntu.sh
+++ b/scripts/install/install_tendermint_ubuntu.sh
@@ -14,14 +14,13 @@ REPO=github.com/tendermint/tendermint
 BRANCH=master
 
 sudo apt-get update -y
-sudo apt-get upgrade -y
 sudo apt-get install -y make
 
 # get and unpack golang
-curl -O https://storage.googleapis.com/golang/go1.10.linux-amd64.tar.gz
-tar -xvf go1.10.linux-amd64.tar.gz
+curl -O https://storage.googleapis.com/golang/go1.11.linux-amd64.tar.gz
+tar -xvf go1.11.linux-amd64.tar.gz
 
-# move go binary and add to path
+# move go folder and add go binary to path
 sudo mv go /usr/local
 echo "export PATH=\$PATH:/usr/local/go/bin" >> ~/.profile
 
@@ -29,12 +28,11 @@ echo "export PATH=\$PATH:/usr/local/go/bin" >> ~/.profile
 mkdir goApps
 echo "export GOPATH=$HOME/goApps" >> ~/.profile
 echo "export PATH=\$PATH:\$GOPATH/bin" >> ~/.profile
-
 source ~/.profile
 
 # get the code and move into repo
 go get $REPO
-cd $GOPATH/src/$REPO
+cd "$GOPATH/src/$REPO"
 
 # build & install
 git checkout $BRANCH