Skip to content

Commit

Permalink
Revert "Makefile, bin: Support multiple GOPATH components"
Browse files Browse the repository at this point in the history
This reverts commit ff75bc0,
which broke building on windows. See #2833.

License: MIT
Signed-off-by: Lars Gierth <[email protected]>
  • Loading branch information
Lars Gierth committed Jun 17, 2016
1 parent 868a1e3 commit ad461c6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ bin/gx-go-v%:
gx_check: ${gx_bin} ${gx-go_bin}

path_check:
@bin/check_go_path $(realpath $(shell pwd)) $(realpath $(addsuffix /src/github.com/ipfs/go-ipfs,$(subst :, ,$(GOPATH))))
@bin/check_go_path $(realpath $(shell pwd)) $(realpath $(GOPATH)/src/github.com/ipfs/go-ipfs)

deps: go_check gx_check path_check
${gx_bin} --verbose install --global
Expand Down
16 changes: 6 additions & 10 deletions bin/check_go_path
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh

PWD=$1
EXPECTED=$2

if [ -z "$PWD" ]; then
echo "must pass in your current working directory"
Expand All @@ -12,13 +13,8 @@ if [ -z "$GOPATH" ]; then
exit 1
fi

while [ ${#} -gt 1 ]; do
if [ "$PWD" = "$2" ]; then
exit 0
fi
shift
done

echo "go-ipfs must be built from within your \$GOPATH directory."
echo "expected within '$GOPATH' but got '$PWD'"
exit 1
if [ "$PWD" != "$EXPECTED" ]; then
echo "go-ipfs must be built from within your \$GOPATH directory."
echo "expected '$EXPECTED' but got '$PWD'"
exit 1
fi

0 comments on commit ad461c6

Please sign in to comment.