diff --git a/bin/check_go_path b/bin/check_go_path deleted file mode 100755 index 33567ce00..000000000 --- a/bin/check_go_path +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -e - -PKG="$1" - -DIR="$(pwd -P)" -GOPATH="$(go env GOPATH)" - -# The path separator is ; on windows. -if [ "$(go env GOOS)" = "windows" ]; then - PATHSEP=';' -else - PATHSEP=':' -fi - -while read -r -d "$PATHSEP" p; do - if ! cd "$p/src/$PKG" 2>/dev/null; then - continue - fi - - if [ "$DIR" = "$(pwd -P)" ]; then - exit 0 - fi - cd "$DIR" -done <<< "$GOPATH$PATHSEP" - -echo "go-ipfs must be built from within your \$GOPATH directory." -echo "expected within '$GOPATH' but got '$DIR'" -exit 1 diff --git a/bin/check_gx_program b/bin/check_gx_program deleted file mode 100755 index a1e7770ab..000000000 --- a/bin/check_gx_program +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# Check if a gx program is installed and if its version is at least -# equal to a minimum version number. -# -# Call it for example like this: -# -# $ check_gx_program "gx-go" "0.2.0" "Use 'make gx_upgrade' to install or upgrade gx-go." -# -# or: -# -# $ check_gx_program "gx" "0.3" "Use 'make gx_upgrade' to install or upgrade gx." -# - -USAGE="$0 GX_PROGRAM_NAME GX_MIN_VERSION UPGRADE_MSG" - -die() { - printf >&2 "fatal: %s\n" "$@" - exit 1 -} - -# Get arguments - -test "$#" -eq "3" || die "This program must be passed exactly 3 arguments" "Usage: $USAGE" - -GX_PROGRAM_NAME="$1" -GX_MIN_VERSION="$2" -UPGRADE_MSG="$3" - -# Get path to the directory containing this file -# If $0 has no slashes, uses "./" -PREFIX=$(expr "$0" : "\(.*\/\)") || PREFIX='./' -# Include the 'check_at_least_version' function -. ${PREFIX}check_version - -# Check that the gx program exists - -type "$GX_PROGRAM_NAME" >/dev/null 2>&1 || die_upgrade "Program $GX_PROGRAM_NAME is not installed!" - -# Check the gx program version - -VERS_STR=$($GX_PROGRAM_NAME -v 2>&1) || die "'$GX_PROGRAM_NAME -v' failed with output: $VERS_STR" - -GX_CUR_VERSION=$(expr "$VERS_STR" : ".*$GX_PROGRAM_NAME.* version \(.*\)") || die "Invalid '$GX_PROGRAM_NAME -v' output: $VERS_STR" - -check_at_least_version "$GX_MIN_VERSION" "$GX_CUR_VERSION" "$GX_PROGRAM_NAME" diff --git a/mk/golang.mk b/mk/golang.mk index 763d516b2..884c4a0e2 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -71,10 +71,5 @@ check_go_version: .PHONY: check_go_version DEPS_GO += check_go_version -check_go_path: - GOPATH="$(GOPATH)" bin/check_go_path github.com/ipfs/go-ipfs -.PHONY: check_go_path -DEPS_GO += check_go_path - TEST += $(TEST_GO) TEST_SHORT += test_go_fmt test_go_short