Unverified Commit a8dee63f authored by Ryan Tvenge's avatar Ryan Tvenge Committed by Marc Cornellà

feat(lando): bypass `lando` if command is not available in container (#11993)

Closes #11993
parent 104041a0
...@@ -11,15 +11,23 @@ function artisan \ ...@@ -11,15 +11,23 @@ function artisan \
php \ php \
wp \ wp \
yarn { yarn {
if checkForLandoFile; then # If the lando task is available in `lando --help`, then it means:
lando "$0" "$@" #
# 1. `lando` is in a project with a `.lando.yml` file.
# 2. The lando task is available for lando, based on the .lando.yml config file.
#
# This has a penalty of about 250ms, so we still want to check if the lando file
# exists before, which is the fast path. If it exists, checking help output is
# still faster than running the command and failing.
if _lando_file_exists && lando --help 2>&1 | command grep -Eq "^ +lando $0 "; then
command lando "$0" "$@"
else else
command "$0" "$@" command "$0" "$@"
fi fi
} }
# Check for the file in the current and parent directories. # Check for the file in the current and parent directories.
checkForLandoFile() { _lando_file_exists() {
# Only bother checking for lando within the Sites directory. # Only bother checking for lando within the Sites directory.
if [[ "$PWD/" != "$LANDO_ZSH_SITES_DIRECTORY"/* ]]; then if [[ "$PWD/" != "$LANDO_ZSH_SITES_DIRECTORY"/* ]]; then
# Not within $LANDO_ZSH_SITES_DIRECTORY # Not within $LANDO_ZSH_SITES_DIRECTORY
...@@ -38,4 +46,4 @@ checkForLandoFile() { ...@@ -38,4 +46,4 @@ checkForLandoFile() {
# Could not find $LANDO_ZSH_CONFIG_FILE in the current directory # Could not find $LANDO_ZSH_CONFIG_FILE in the current directory
# or in any of its parents up to $LANDO_ZSH_SITES_DIRECTORY. # or in any of its parents up to $LANDO_ZSH_SITES_DIRECTORY.
return 1 return 1
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment