From e509b27a5ca78612d0a080265ef62e7ea897a296 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 13 Apr 2020 14:07:55 +0200
Subject: Convert build and packaging scripts to Go Modules

---
 build.bash | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'build.bash')

diff --git a/build.bash b/build.bash
index b8d5fa8..06a6b60 100755
--- a/build.bash
+++ b/build.bash
@@ -11,21 +11,17 @@
 # .
 
 cd "$(dirname "$0")"
-MYDIR=$PWD
 
 # Make sure we have the go binary
 go version > /dev/null
 
+# Make it work on Go 1.11 and 1.12
+# https://dev.to/maelvls/why-is-go111module-everywhere-and-everything-about-go-modules-24k#-raw-go111module-endraw-with-go-111-and-112
+export GO111MODULE=on
+
 # GOPATH may contain multiple paths separated by ":"
 GOPATH1=$(go env GOPATH | cut -f1 -d:)
 
-if [[ $PWD != *"/src/github.com/rfjakob/gocryptfs" ]] ; then
-	echo "Warning: Building outside of GOPATH will most likely fail."
-	echo "         Please rename $PWD to $GOPATH1/src/github.com/rfjakob/gocryptfs ."
-	sleep 5
-	echo
-fi
-
 # gocryptfs version according to git or a VERSION file
 if [[ -d .git ]] ; then
 	GITVERSION=$(git describe --tags --dirty)
@@ -44,19 +40,15 @@ fi
 if [[ -d vendor/github.com/hanwen/go-fuse ]] ; then
 	GITVERSIONFUSE="[vendored]"
 else
-	# go-fuse version according to git
-	# Note: git in CentOS 7 does not have "git -C" yet, so we use plain "cd".
+	# go-fuse version according to Go Modules
 	FAIL=0
-	cd "$GOPATH1/src/github.com/hanwen/go-fuse"
-	OUT=$(git describe --tags --dirty 2>&1) || FAIL=1
+	OUT=$(go list -m github.com/hanwen/go-fuse | cut -d' ' -f2) || FAIL=1
 	if [[ $FAIL -eq 0 ]]; then
 		GITVERSIONFUSE=$OUT
 	else
-		echo "$PWD: git describe: $OUT"
 		echo "Warning: could not determine go-fuse version"
 		GITVERSIONFUSE="[unknown]"
 	fi
-	cd "$MYDIR"
 fi
 
 # Build date, something like "2017-09-06". Don't override BUILDDATE
-- 
cgit v1.2.3