Make sure gopath and path configured correctly.

intelsdi-x · Jun 28, 2016 · 87c3564 · 87c3564
1 parent a1854e0
commit 87c3564
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/scripts/common.sh b/scripts/common.sh
@@ -59,6 +59,24 @@ _go_get() {
   type -p "${_util}" > /dev/null || go get "${_url}" && _debug "go get ${_util} ${_url}"
 }
 
+_path_prepend() {
+  if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
+    PATH="$1${PATH:+":$PATH"}"
+  fi
+}
+
+_go_path() {
+  [[ ! -z $GOPATH ]] || _error "Error \$GOPATH unset"
+
+  # NOTE: handles colon separated gopath
+  go_bin_path=${GOPATH//://bin:}/bin
+
+  _path_prepend "${go_bin_path}"
+
+  _debug "GOPATH: ${GOPATH}"
+  _debug "PATH: ${PATH}"
+}
+
 _goimports() {
   _go_get golang.org/x/tools/cmd/goimports
   test -z "$(goimports -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") | tee /dev/stderr)"

diff --git a/scripts/deps.sh b/scripts/deps.sh
@@ -54,6 +54,7 @@ install_go_dep() {
 restore_go_dep() {
   local _dep=${_dep:=$(_detect_dep)}
   _info "restoring dependency with ${_dep}"
+  _go_path
   case $_dep in
     godep)
       (cd "${__proj_dir}" && godep restore)