From f79baf2c8d4c8c4fed2642bdd9d3b0d425ac9b5f Mon Sep 17 00:00:00 2001
From: "Brian J. Cardiff" <bcardiff@gmail.com>
Date: Wed, 22 Jul 2020 12:19:48 -0300
Subject: [PATCH 1/3] Allow overriding CRYSTAL_PATH in the wrapper script

---
 bin/crystal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/crystal b/bin/crystal
index 7d2e3ebf1048..5035d89c7037 100755
--- a/bin/crystal
+++ b/bin/crystal
@@ -138,14 +138,14 @@ SCRIPT_ROOT="$(dirname "$SCRIPT_PATH")"
 CRYSTAL_ROOT="$(dirname "$SCRIPT_ROOT")"
 CRYSTAL_DIR="$CRYSTAL_ROOT/.build"
 
-export CRYSTAL_PATH=lib:$CRYSTAL_ROOT/src
+export CRYSTAL_PATH="${CRYSTAL_PATH:-lib:$CRYSTAL_ROOT/src}"
 export CRYSTAL_HAS_WRAPPER=true
 
 export CRYSTAL="${CRYSTAL:-"crystal"}"
 
 if [ -z "$CRYSTAL_CONFIG_LIBRARY_PATH" ]; then
   export CRYSTAL_CONFIG_LIBRARY_PATH="$(
-    export PATH="$(remove_path_item "$(remove_path_item "$PATH" "$SCRIPT_ROOT")" "bin")" 
+    export PATH="$(remove_path_item "$(remove_path_item "$PATH" "$SCRIPT_ROOT")" "bin")"
     crystal env CRYSTAL_LIBRARY_PATH || echo ""
   )"
 fi

From 47f5717136b92311477a7588990bc29dcd76de1d Mon Sep 17 00:00:00 2001
From: "Brian J. Cardiff" <bcardiff@gmail.com>
Date: Thu, 23 Jul 2020 11:43:32 -0300
Subject: [PATCH 2/3] Add warning if CRYSTAL_ROOT/src is not included in
 CRYSTAL_PATH

---
 bin/crystal | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/crystal b/bin/crystal
index 5035d89c7037..ec70846e497d 100755
--- a/bin/crystal
+++ b/bin/crystal
@@ -139,6 +139,10 @@ CRYSTAL_ROOT="$(dirname "$SCRIPT_ROOT")"
 CRYSTAL_DIR="$CRYSTAL_ROOT/.build"
 
 export CRYSTAL_PATH="${CRYSTAL_PATH:-lib:$CRYSTAL_ROOT/src}"
+if [ -n "${CRYSTAL_PATH##*$CRYSTAL_ROOT/src*}" ]; then
+  __warning_msg "CRYSTAL_PATH env variable does not contains $CRYSTAL_ROOT/src"
+fi
+
 export CRYSTAL_HAS_WRAPPER=true
 
 export CRYSTAL="${CRYSTAL:-"crystal"}"

From 45bf596932b9e8cc834921192d5a830c20a38abd Mon Sep 17 00:00:00 2001
From: "Brian J. Cardiff" <bcardiff@gmail.com>
Date: Thu, 23 Jul 2020 14:20:25 -0300
Subject: [PATCH 3/3] Perform brew update in circleci

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59c9ab0cc2a3..8be9ceeb152d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,6 +92,7 @@ jobs:
           keys:
             - brew-cache-v1
       - checkout
+      - run: brew update
       - run: bin/ci prepare_system
       - run: echo 'export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig"' >> $BASH_ENV
       - run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV