From 51aafde4dffa6bcdca33095c0f267c0f30cbc064 Mon Sep 17 00:00:00 2001 From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 09:20:50 -0600 Subject: [PATCH] [release-18.0] Update env.sh so that is does not error when running on Mac (#15835) (#15914) Signed-off-by: bddicken Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com> --- examples/common/env.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/common/env.sh b/examples/common/env.sh index 51d0fcb6487..50df4a65296 100644 --- a/examples/common/env.sh +++ b/examples/common/env.sh @@ -79,6 +79,8 @@ mkdir -p "${VTDATAROOT}/tmp" alias mysql="command mysql --no-defaults -h 127.0.0.1 -P 15306" alias vtctldclient="command vtctldclient --server localhost:15999" -# Make sure aliases are expanded in non-interactive shell -shopt -s expand_aliases +# If using bash, make sure aliases are expanded in non-interactive shell +if [[ -n ${BASH} ]]; then + shopt -s expand_aliases +fi