Fixed more Go stuff

frameworks/Go/beego/setup.sh

@@ -4,8 +4,6 @@ sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 
 fw_depends go
 
-export GOPATH=${TROOT}
-
 go get github.com/astaxie/beego
 go get github.com/go-sql-driver/mysql
 

frameworks/Go/falcore/setup.sh

@@ -4,7 +4,5 @@ sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/framework_benchmarks/falco
 
 fw_depends go
 
-export GOPATH=${TROOT}
-
 go get ./...
 go run src/framework_benchmarks/falcore.go &

frameworks/Go/gin/setup.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get github.com/gin-gonic/gin
 go get github.com/go-sql-driver/mysql

frameworks/Go/go-raw-mongodb/setup.sh

@@ -3,7 +3,6 @@
 sed -i 's|connectionString = "localhost"|connectionString = "'"${DBHOST}"'"|g' src/hello/hello.go
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get gopkg.in/mgo.v2
 go get ./...

frameworks/Go/go-raw/setup.sh

@@ -3,7 +3,6 @@
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get ./...
 

frameworks/Go/go-raw/setup_prefork.sh

@@ -3,7 +3,6 @@
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get ./...
 

frameworks/Go/goji/setup.sh

@@ -1,16 +1,9 @@
 #!/bin/bash
 
-<<<<<<< HEAD
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/goji/server.go
 
 fw_depends go
 
-=======
-export GOROOT=${IROOT}/go
->>>>>>> master
-export GOPATH=${TROOT}
-export GOGC=800
-
 go get github.com/go-sql-driver/mysql
 go get github.com/zenazn/goji
 go get github.com/zenazn/goji/web

frameworks/Go/revel-jet/setup.sh

@@ -3,7 +3,6 @@
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get -u github.com/robfig/revel/revel github.com/eaigner/jet
 go build -o bin/revel github.com/robfig/revel/revel

frameworks/Go/revel-qbs/setup.sh

@@ -3,7 +3,6 @@
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get -u github.com/robfig/revel/revel github.com/coocood/qbs
 go build -o bin/revel github.com/robfig/revel/revel

frameworks/Go/revel/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
 fw_depends go
-export GOPATH=${TROOT}
-export GOGC=800
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 

frameworks/Go/webgo/setup.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 fw_depends go
-export GOPATH=${TROOT}
 
 go get github.com/hoisie/web
 

toolset/setup/linux/languages/go.sh

@@ -12,6 +12,7 @@ fw_get -O https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz
 fw_untar go$VERSION.linux-amd64.tar.gz
 
 echo "export GOROOT=${IROOT}/go" > $IROOT/go.installed
+echo -e "export GOPATH=\$TROOT" >> $IROOT/go.installed
 echo -e "export PATH=\$GOROOT/bin:\$PATH" >> $IROOT/go.installed
 echo "export GOGC=800" >> $IROOT/go.installed