From ffc000943b33724b1df0db69af35123abb1331a8 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 29 Jun 2016 22:27:32 +0200 Subject: [PATCH] build.bash: support colon-separated GOPATH variable Fixes issue #31 https://github.com/rfjakob/gocryptfs/issues/31 --- build.bash | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build.bash b/build.bash index 2ea499c..115a2ae 100755 --- a/build.bash +++ b/build.bash @@ -4,12 +4,15 @@ set -eu cd "$(dirname "$0")" +# GOPATH may contain multiple paths separated by ":" +GOPATH2=$(echo $GOPATH | cut -f1 -d:) + # gocryptfs version according to git GITVERSION=$(git describe --tags --dirty) # go-fuse version according to git GITVERSIONFUSE=$( - cd $GOPATH/src/github.com/hanwen/go-fuse + cd $GOPATH2/src/github.com/hanwen/go-fuse SHORT=$(git rev-parse --short HEAD) # Check if the tree is dirty, adapted from @@ -37,5 +40,5 @@ fi ./gocryptfs -version -mkdir -p $GOPATH/bin -cp -af gocryptfs $GOPATH/bin +mkdir -p $GOPATH2/bin +cp -af gocryptfs $GOPATH2/bin