Merge pull request getcarina#126 from carolynvs/fix-homebrew-build

Change how we install glide to work with homebew's build
carolynvs · Jan 6, 2017 · 15e3e77 · 15e3e77
2 parents 93b4c69 + a3d6df0
commit 15e3e77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,8 @@ go:
 - 1.7
 git:
   depth: 9999999
-sudo: required
 install:
-- sudo -E PATH=$PATH make get-deps
+- make get-deps
 script:
 - make test
 - make cross-build

diff --git a/script/install-glide.sh b/script/install-glide.sh
@@ -13,15 +13,17 @@ if type glide &> /dev/null ; then
 fi
 
 echo "Installing glide v0.11.1..."
-git clone https://github.com/Masterminds/glide.git $GOPATH/src/github.com/Masterminds/glide
+if [ ! -d "$GOPATH/src/github.com/Masterminds/glide" ]; then
+  git clone https://github.com/Masterminds/glide.git $GOPATH/src/github.com/Masterminds/glide
+fi
 cd $GOPATH/src/github.com/Masterminds/glide
 git checkout v0.11.1
-make install
+go install --ldflags="-X main.version=v0.11.1" github.com/Masterminds/glide
 
 if type glide &> /dev/null ; then
     echo "Done!"
     exit 0
 else
-    echo "Could not find glide after installing it. Aborting..."
+    echo "Could not find glide after installing it. Make sure GOPATH/bin is in PATH. Aborting..."
     exit 1
 fi