Merge branch 'release-17.0' of https://github.com/vitessio/vitess int…

…o release-17.0-github
github · May 30, 2024 · e0637c2 · e0637c2
2 parents 1dd1a83 + de4fefe
commit e0637c2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/examples/common/env.sh b/examples/common/env.sh
@@ -90,6 +90,8 @@ alias mysql="command mysql --no-defaults -h 127.0.0.1 -P 15306"
 alias vtctlclient="command vtctlclient --server localhost:15999 --log_dir ${VTDATAROOT}/tmp --alsologtostderr --config-file-not-found-handling=ignore"
 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