From 5ac752f1fbc2e429d7917276d0fc36b96393a83a Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 18 Jul 2018 19:05:01 -0700 Subject: [PATCH] avoid realpath in check_go_path It doesn't exist on all operating systems. License: MIT Signed-off-by: Steven Allen --- bin/check_go_path | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/bin/check_go_path b/bin/check_go_path index 7f2692cc94e..a32996ec929 100755 --- a/bin/check_go_path +++ b/bin/check_go_path @@ -4,15 +4,20 @@ set -e PKG="$1" -PWD="$(realpath "$(pwd)")" +DIR="$(pwd -P)" GOPATH="$(go env GOPATH)" -for p in IFS=: "${GOPATH}"; do - if [ "$PWD" = "$(realpath "$p")/src/$PKG" ]; then +while read -d ':' p; do + if ! cd "$p/src/$PKG" 2>/dev/null; then + continue + fi + + if [ "$DIR" = "$(pwd -P)" ]; then exit 0 fi -done + cd "$DIR" +done <<< "$GOPATH:" echo "go-ipfs must be built from within your \$GOPATH directory." -echo "expected within '$GOPATH' but got '$PWD'" +echo "expected within '$GOPATH' but got '$DIR'" exit 1