Browse Source

build: ignore calling environment

Brian Waldon 11 years ago
parent
commit
81585716dc
1 changed files with 5 additions and 15 deletions
  1. 5 15
      build

+ 5 - 15
build

@@ -3,22 +3,12 @@
 ORG_PATH="github.com/coreos"
 ORG_PATH="github.com/coreos"
 REPO_PATH="${ORG_PATH}/etcd"
 REPO_PATH="${ORG_PATH}/etcd"
 
 
-# If the user hasn't set up a GOPATH, make one for them
-if [[ -z "$GOPATH" ]]; then 
-	GOPATH=${PWD}/gopath
-	if [ ! -h gopath/src/${REPO_PATH} ]; then
-		mkdir -p gopath/src/${ORG_PATH}
-		ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
-	fi
-	# Similarly, set up GOBIN if not already set
-	if [[ -z "$GOBIN" ]]; then 
-		GOBIN=${PWD}/bin
-	fi
-fi
+export GOPATH=${PWD}/gopath
 
 
-export GOPATH=$GOPATH
-export GOBIN=$GOBIN
+rm -f $GOPATH/src/${REPO_PATH}
+mkdir -p $GOPATH/src/${ORG_PATH}
+ln -s ${PWD} $GOPATH/src/${REPO_PATH}
 
 
 eval $(go env)
 eval $(go env)
 
 
-go install ${REPO_PATH}
+go build -o bin/etcd ${REPO_PATH}