Skip to content

Commit de4fefe

Browse files
[release-17.0] Update env.sh so that is does not error when running on Mac (#15835) (#15913)
Signed-off-by: bddicken <bddicken@gmail.com> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
1 parent 5fabd57 commit de4fefe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

examples/common/env.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ alias mysql="command mysql --no-defaults -h 127.0.0.1 -P 15306"
9090
alias vtctlclient="command vtctlclient --server localhost:15999 --log_dir ${VTDATAROOT}/tmp --alsologtostderr --config-file-not-found-handling=ignore"
9191
alias vtctldclient="command vtctldclient --server localhost:15999"
9292

93-
# Make sure aliases are expanded in non-interactive shell
94-
shopt -s expand_aliases
93+
# If using bash, make sure aliases are expanded in non-interactive shell
94+
if [[ -n ${BASH} ]]; then
95+
shopt -s expand_aliases
96+
fi
9597

0 commit comments

Comments
 (0)