opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 10:49:24 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
parent 0f3ae0736a ad461c611e
commit 2a3bba3a2b
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -41,7 +41,7 @@ bin/gx-go-v%:
gx_check: ${gx_bin} ${gx-go_bin} gx_check: ${gx_bin} ${gx-go_bin}
path_check: 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 deps: go_check gx_check path_check
${gx_bin} --verbose install --global ${gx_bin} --verbose install --global

16
bin/check_go_path
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
PWD=$1 PWD=$1
EXPECTED=$2
if [ -z "$PWD" ]; then if [ -z "$PWD" ]; then
echo "must pass in your current working directory" echo "must pass in your current working directory"
@ -12,13 +13,8 @@ if [ -z "$GOPATH" ]; then
exit 1 exit 1
fi fi
while [ ${#} -gt 1 ]; do if [ "$PWD" != "$EXPECTED" ]; then
if [ "$PWD" = "$2" ]; then echo "go-ipfs must be built from within your \$GOPATH directory."
exit 0 echo "expected '$EXPECTED' but got '$PWD'"
fi exit 1
shift fi
done
echo "go-ipfs must be built from within your \$GOPATH directory."
echo "expected within '$GOPATH' but got '$PWD'"
exit 1