From 54e41d04f7f46291aa8a21fd918337a09b65eafa Mon Sep 17 00:00:00 2001 From: NorseGaud Date: Sun, 6 Mar 2022 11:37:49 -0500 Subject: [PATCH] removed Darwin specific code and modified the docs to indicate macOS is not supported --- docs/content/contributing/tests.md | 14 +++++--------- setup.sh | 8 -------- test/linting/lint.sh | 12 ++---------- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/docs/content/contributing/tests.md b/docs/content/contributing/tests.md index aa4456cf..4192a6fd 100644 --- a/docs/content/contributing/tests.md +++ b/docs/content/contributing/tests.md @@ -5,13 +5,9 @@ title: 'Contributing | Tests' 1. Install docker 2. Execute `git submodule update --init --recursive` 3. Install jq - - !!! info "MacOS Specific (needed for tests)" - - ```bash - brew install coreutils - # bash >= 4.0 for associative arrays - brew install bash - ``` - 4. Execute `make clean all` + + +!!! info "Can I use MacOS?" + + We do not support running linting, tests, etc on macOS at this time. Please use a linux VM. \ No newline at end of file diff --git a/setup.sh b/setup.sh index 8dd22b41..02f3a953 100755 --- a/setup.sh +++ b/setup.sh @@ -88,14 +88,6 @@ function _show_local_usage function _get_absolute_script_directory { - if [[ "$(uname)" == 'Darwin' ]] - then - readlink() { - # requires coreutils - greadlink "${@:+$@}" - } - fi - if dirname "$(readlink -f "${0}")" &>/dev/null then DIR="$(dirname "$(readlink -f "${0}")")" diff --git a/test/linting/lint.sh b/test/linting/lint.sh index 2cace83a..c7e6d235 100755 --- a/test/linting/lint.sh +++ b/test/linting/lint.sh @@ -1,4 +1,4 @@ -#! /usr/bin/env bash +#! /bin/bash # version v0.2.0 unstable # executed by Make during CI or manually @@ -6,12 +6,6 @@ SCRIPT="lint.sh" -if [[ "$(uname)" == "Darwin" ]] -then - readlink() { - greadlink "${@:+$@}" # Requires coreutils - } -fi SCRIPT_DIR=$(dirname "$(readlink -f "$0")") REPO_ROOT="$(realpath "${SCRIPT_DIR}"/../../)" @@ -104,10 +98,8 @@ function _shellcheck -not -path './test/test_helper/*' \ -not -path './target/docker-configomat/*' )" - # macOS lacks parity for `-executable` but presently produces the same results: https://stackoverflow.com/a/4458361 - [[ "$(uname)" == "Darwin" ]] && FIND_EXEC="-perm -711" || FIND_EXEC="-executable" # shellcheck disable=SC2248 - F_BIN="$(find 'target/bin' ${FIND_EXEC} -type f)" + F_BIN="$(find 'target/bin' -executable -type f)" F_BATS="$(find 'test' -maxdepth 1 -type f -iname '*.bats')" # This command is a bit easier to grok as multi-line.