build.bash: use $(go env GOPATH)

2 files changed, 9 insertions, 8 deletions

diff --git a/README.md b/README.md
index 9384d42..7477957 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,13 @@ as well as in the go-fuse library.
 Compile
 -------
 
-	$ go get github.com/rfjakob/gocryptfs
+	$ go get -d github.com/rfjakob/gocryptfs
+	$ cd $(go env GOPATH)/src/github.com/rfjakob/gocryptfs
+	$ ./build.bash
+
+Or, if you don't have OpenSSL installed:
+
+	$ ./build-without-openssl.bash
 
 Use
 ---
diff --git a/build.bash b/build.bash
index 0dcc272..e492f17 100755
--- a/build.bash
+++ b/build.bash
@@ -4,13 +4,8 @@ set -eu
 
 cd "$(dirname "$0")"
 
-# Starting with Go v1.8, GOPATH may be unset. $HOME/go is used instead.
-if [[ -z ${GOPATH:-} ]] ; then
-	GOPATH1=$HOME/go
-else
-	# GOPATH may contain multiple paths separated by ":"
-	GOPATH1=$(echo $GOPATH | cut -f1 -d:)
-fi
+# GOPATH may contain multiple paths separated by ":"
+GOPATH1=$(go env GOPATH | cut -f1 -d:)
 
 # gocryptfs version according to git
 GITVERSION=$(git describe --tags --dirty)