From 97c593640d41208399cb1fd02e720d9022d27544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Mon, 17 Sep 2018 11:49:10 +0200 Subject: [PATCH] Add macOS grep aliases to hack scripts --- hack/bootstrap.sh | 2 +- hack/tfw.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/bootstrap.sh b/hack/bootstrap.sh index 643a9cc..a6aedfa 100755 --- a/hack/bootstrap.sh +++ b/hack/bootstrap.sh @@ -3,7 +3,7 @@ set -eu set -o pipefail set -o errtrace shopt -s expand_aliases -[ "$(uname)" == "Darwin" ] && alias sed="gsed" || : +[ "$(uname)" == "Darwin" ] && alias sed="gsed" && alias grep="ggrep" || : HERE="$(pwd)" CHALLENGE=${CHALLENGE:-test-tutorial-framework} diff --git a/hack/tfw.sh b/hack/tfw.sh index 46a843b..f05f2b7 100755 --- a/hack/tfw.sh +++ b/hack/tfw.sh @@ -3,7 +3,7 @@ set -eu set -o pipefail set -o errtrace shopt -s expand_aliases -[ "$(uname)" == "Darwin" ] && alias readlink="greadlink" || : +[ "$(uname)" == "Darwin" ] && alias readlink="greadlink" && alias grep="ggrep" || : SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" TFW_PATH="${TFW_PATH:-$SCRIPT_DIR/../..}"