Add version in filename of dep binary to prevent version conflicts

Signed-off-by: Kevin Lingerfelt <[email protected]>

.gitignore

@@ -12,5 +12,4 @@ web/app/dist
 web/app/yarn-error.log
 .protoc
 .gorun
-.dep
-.dep.exe
+.dep*

bin/dep

@@ -6,8 +6,8 @@ set -eu
 # Keep this in sync with Dockerfile-go-deps. The digests will be different for each
 # version and each platform; they can be found in the *.sha256 files alongside the
 # executables at ${dep_base_url}.
-depversion=v0.5.0
-dep_base_url="https://github.com/golang/dep/releases/download/${depversion}/"
+depversion=0.5.0
+dep_base_url="https://github.com/golang/dep/releases/download/v${depversion}/"
 
 cd "$(pwd -P)"
 
@@ -23,24 +23,17 @@ elif [ "$(uname -o)" = "Msys" ]; then
   exe=.exe
 fi
 
-depbin="${rootdir}/.dep${exe}"
+depbin="${rootdir}/.dep-${depversion}${exe}"
 depurl="${dep_base_url}dep-${os}-amd64${exe}"
 
-if [ -f "$depbin" ]; then
-  version=$($depbin version | grep "^ version" | awk '{print $3}' | awk -F '-' '{print $1}')
-  if [ "$version" != "$depversion" ]; then
-    rm "$depbin"
-  fi
-fi
-
 if [ ! -f "$depbin" ]; then
   tmp=$(mktemp -d -t dep.XXX)
   (
     cd "$tmp"
     curl -L --silent --fail -o depbin "$depurl"
     sha=$(curl -L --silent --fail "${depurl}.sha256" | awk '{ print $1 }')
     (echo "$sha *depbin" | shasum -c -a 256 -p -s -) || {
-      echo "Actual digest of $depbin does not match expected digest."
+      echo "Actual digest of $(pwd)/depbin does not match expected digest."
       exit 1
     }
     chmod +x depbin