diff --git a/Makefile b/Makefile index d2f1bc5ca..5b8a5bf1c 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ gxgo_upgrade: go get -u github.com/whyrusleeping/gx-go path_check: - @bin/check_go_path + @bin/check_go_path $(realpath $(shell pwd)) gx_check: @bin/check_gx_program "gx" "0.3" 'Upgrade or install gx using your package manager or run `make gx_upgrade`' diff --git a/bin/check_go_path b/bin/check_go_path index eb157e29b..cc78615a5 100755 --- a/bin/check_go_path +++ b/bin/check_go_path @@ -1,20 +1,21 @@ #!/bin/sh +PWD=$1 + +if [ -z "$PWD" ]; then + echo "must pass in your current working directory" + exit 1 +fi + if [ -z "$GOPATH" ]; then echo "GOPATH not set, you must have go configured properly to install ipfs" exit 1 fi -if ! type -f realpath > /dev/null; then - echo "program 'realpath' not found, it is required for this check" - exit 1 -fi - -PWD=$(pwd) -REALPWD=$(realpath "$PWD") EXPECTED="$GOPATH/src/github.com/ipfs/go-ipfs" -if [ "$REALPWD" != "$EXPECTED" ]; then +if [ "$PWD" != "$EXPECTED" ]; then echo "go-ipfs must be built from within your \$GOPATH directory." + echo "expected '$EXPECTED' but got '$PWD'" exit 1 fi