You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2021/03/23 03:26:04 UTC

[airflow] 17/34: Fixes recent scripting breeze fix to work also with zsh (#14787)

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit a4fce7bc19d484df81e257ee6c987c24952aa268
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Mar 15 10:58:09 2021 +0100

    Fixes recent scripting breeze fix to work also with zsh (#14787)
    
    The BASH variable introduced in #14579 is not set when the main shell is
    zsh on MacOS (which is the default) this PR changes it so that the
    output of `command -v bash` is used instead.
    
    Fixes #14754
    
    (cherry picked from commit c613384feb52db39341a8d3a52b7f47695232369)
---
 breeze | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/breeze b/breeze
index 7e3432d..5816e04 100755
--- a/breeze
+++ b/breeze
@@ -25,7 +25,7 @@ if [[ ${BREEZE_REDIRECT=} == "" ]]; then
     mkdir -p "${AIRFLOW_SOURCES}"/logs
     export BREEZE_REDIRECT="true"
     if [[ "$(uname)" == "Darwin" ]]; then
-      exec script -q "${AIRFLOW_SOURCES}"/logs/breeze.out "$BASH" -c "$(printf "%q " "${0}" "${@}")"
+      exec script -q "${AIRFLOW_SOURCES}"/logs/breeze.out "$(command -v bash)" -c "$(printf "%q " "${0}" "${@}")"
     else
       exec script --return --quiet "${AIRFLOW_SOURCES}"/logs/breeze.out -c "$(printf "%q " "${0}" "${@}")"
     fi