1
0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 10:49:24 +08:00

Merge pull request #2862 from ipfs/revert-multi-gopath

Revert "Makefile, bin: Support multiple GOPATH components"
This commit is contained in:
Jeromy Johnson
2016-06-17 11:11:39 -07:00
committed by GitHub
2 changed files with 7 additions and 11 deletions

View File

@ -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

View File

@ -1,6 +1,7 @@
#!/bin/sh
PWD=$1
EXPECTED=$2
if [ -z "$PWD" ]; then
echo "must pass in your current working directory"
@ -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