From 7862a20050df64ad86acafc9ff43ffbcaa89e281 Mon Sep 17 00:00:00 2001
From: Alex Suraci and Jon Stevens <pair+alex+jstevens@pivotallabs.com>
Date: Thu, 13 Jun 2013 16:26:12 -0700
Subject: [PATCH] Revert "stop using bin/go and bin/env"

This reverts commit 42bb42d0da5bc3e7073e157b687418313490520e.
---
 .travis.yml | 4 ++--
 bin/env     | 7 +++++++
 bin/go      | 3 +++
 bin/test    | 6 +++---
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100755 bin/env
 create mode 100755 bin/go

diff --git a/.travis.yml b/.travis.yml
index c08308ea0..ba9a6b74d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,6 @@ install: go get -d -v ./src/github.com/...
 
 script:
   - gem install nats
-  - go version
-  - go env
+  - bin/go version
+  - bin/go env
   - bin/test
diff --git a/bin/env b/bin/env
new file mode 100755
index 000000000..f175d9aaf
--- /dev/null
+++ b/bin/env
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+pushd $(dirname $0)/.. > /dev/null
+base=$PWD
+popd > /dev/null
+
+exec env GOPATH=$base $@
diff --git a/bin/go b/bin/go
new file mode 100755
index 000000000..ad8b317ae
--- /dev/null
+++ b/bin/go
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec $(dirname $0)/env go $@
diff --git a/bin/test b/bin/test
index 49b0ff052..942db5dea 100755
--- a/bin/test
+++ b/bin/test
@@ -10,7 +10,7 @@ echo --- Installing
 for p in $(packages)
 do
   echo $p
-  go test -i $p
+  bin/go test -i $p
 done
 
 echo --- Testing
@@ -21,9 +21,9 @@ do
 
     if grep -q launchpad.net/gocheck src/$p/*.go
     then
-      go test $p -test.v=true -gocheck.v=true $*
+      bin/go test $p -test.v=true -gocheck.v=true $*
     else
-      go test $p -test.v=true $*
+      bin/go test $p -test.v=true $*
     fi
   fi
 done