Merge pull request #62 from markdryan/gopath-setup

utils: Use go env to discover the GOPATH
kata-containers · Mar 16, 2018 · 65012d0 · 65012d0
2 parents d1bdf80 + 96c4977
commit 65012d0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/virtcontainers/utils/virtcontainers-setup.sh b/virtcontainers/utils/virtcontainers-setup.sh
@@ -19,11 +19,13 @@ set -e
 
 SCRIPT_PATH=$(dirname $(readlink -f $0))
 
-if [[ -z "$GOPATH" ]]; then
-	echo "This script requires GOPATH to be set. You may need to invoke via 'sudo -E PATH=$PATH ./virtcontainers-setup.sh'"
+if [ ! $(command -v go) ]; then
+	echo "This script requires go to be installed and executable"
 	exit 1
 fi
 
+GOPATH=$(go env "GOPATH")
+
 if [ ! $(command -v docker) ]; then
 	echo "This script requires docker to be installed and executable"
 	exit 1