diff --git a/bin/update-gotools b/bin/update-gotools
index 1c1b645..c5023fa 100755
--- a/bin/update-gotools
+++ b/bin/update-gotools
@@ -1,30 +1,29 @@
-#!/bin/bash -ex
+#!/bin/bash
+
+set -ex
+set -o pipefail
 
 export GOPATH="${HOME}/gocode"
+rm -rf ${GOPATH}
+mkdir -p ${GOPATH}
 
 # Re-Install gocode
-rm -rf "${GOPATH}/bin/gocode"
 go get -u github.com/nsf/gocode
 
 # Re-Install gometalinter
-rm -rf "${GOPATH}/bin/gometalinter"
 go get -u github.com/alecthomas/gometalinter
 ${GOPATH}/bin/gometalinter --install --update
 
 # Re-Install godebug
-rm -rf "${GOPATH}/bin/godebug"
 go get -u github.com/mailgun/godebug
 
 # Re-Install godep
-rm -rf "${GOPATH}/bin/godep"
 go get -u github.com/tools/godep
 
 # Re-Install go-bindata
-rm -rf "${GOPATH}/bin/go-bindata"
 go get -u github.com/jteeuwen/go-bindata/...
 
 # Re-Install hclfmt
-rm -rf "${GOPATH}/bin/hclfmt"
 go get -u github.com/fatih/hclfmt
 
 # Ensure vim-go can work