From cc6e8b631b89f8843cdb55790108440cb3d5ec04 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 26 Aug 2017 05:38:22 -0400 Subject: [PATCH] fix: use gnu readlink to make tests pass on os x --- .gitignore | 1 + Makefile | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 266ef35..f4266cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ tests/dokku tests/fixtures tests/bin/plugn +tests/bin/readlink .vagrant diff --git a/Makefile b/Makefile index 2d94e40..c7b00bd 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,15 @@ else endif endif -ci-dependencies: shellcheck bats +readlink: +ifeq ($(shell uname),Darwin) +ifeq ($(shell greadlink > /dev/null 2>&1 ; echo $$?),127) + brew install coreutils +endif + ln -nfs `which greadlink` tests/bin/readlink +endif + +ci-dependencies: shellcheck bats readlink lint: # these are disabled due to their expansive existence in the codebase. we should clean it up though