scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 02:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from BRMatt/patch-1

Browse Source 
Ensure build.sh uses dependencies vendored by godeps
This commit is contained in:
Armon Dadgar
2015-07-22 17:30:06 -07:00
parent a721fcfe37 e477ff2f94
commit 5024c84e5d
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/build.sh
View File

@@ -19,9 +19,14 @@ GIT_DIRTY=$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)
XC_ARCH=${XC_ARCH:-"386 amd64 arm"} XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
XC_OS=${XC_OS:-linux darwin windows freebsd openbsd} XC_OS=${XC_OS:-linux darwin windows freebsd openbsd}
# Install dependencies # Store the original GOPATH so we can move the binary to it later
echo "==> Getting dependencies..." ORIGINAL_GOPATH=${GOPATH:-$(go env GOPATH)}
go get ./... GOPATH="$(godep path):$ORIGINAL_GOPATH"
case $(uname) in
CYGWIN*)
ORIGINAL_GOPATH="$(cygpath $ORIGINAL_GOPATH)"
;;
esac
# Delete the old dir # Delete the old dir
echo "==> Removing old directory..." echo "==> Removing old directory..."
@@ -47,14 +52,8 @@ gox \
. .
# Move all the compiled things to the $GOPATH/bin # Move all the compiled things to the $GOPATH/bin
GOPATH=${GOPATH:-$(go env GOPATH)}
case $(uname) in
CYGWIN*)
GOPATH="$(cygpath $GOPATH)"
;;
esac
OLDIFS=$IFS OLDIFS=$IFS
IFS=: MAIN_GOPATH=($GOPATH) IFS=: MAIN_GOPATH=($ORIGINAL_GOPATH)
IFS=$OLDIFS IFS=$OLDIFS
# Copy our OS/Arch to the bin/ directory # Copy our OS/Arch to the bin/ directory