From 65519a0367c333c50b8808ed57504b3aad17b6f5 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Tue, 23 Feb 2016 22:26:37 -0800 Subject: [PATCH] move gopath check to separate script and use realpath for symlink handling License: MIT Signed-off-by: Jeromy --- Makefile | 2 +- bin/check_go_path | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100755 bin/check_go_path diff --git a/Makefile b/Makefile index f346e595a..d2f1bc5ca 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ gxgo_upgrade: go get -u github.com/whyrusleeping/gx-go path_check: - test "$(shell pwd)" = "$(GOPATH)/src/github.com/ipfs/go-ipfs" || (echo "go-ipfs must be built from within your \$$GOPATH directory." && false) + @bin/check_go_path 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 new file mode 100755 index 000000000..eb157e29b --- /dev/null +++ b/bin/check_go_path @@ -0,0 +1,20 @@ +#!/bin/sh + +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 + echo "go-ipfs must be built from within your \$GOPATH directory." + exit 1 +fi