Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6492792d authored by Greg Hackmann's avatar Greg Hackmann Committed by Gerrit Code Review
Browse files

Merge "Consult tput about color control sequence support"

parents d408e607 d95c7f70

envsetup.sh

+13 −13
Original line number Diff line number Diff line
@@ -1354,19 +1354,21 @@ function make() 
    local hours=$(($tdiff / 3600 ))

    local mins=$((($tdiff % 3600) / 60))

    local secs=$(($tdiff % 60))

    echo

    if [ $ret -eq 0 ] ; then

        if [ $(uname) != "Darwin" ]; then

            echo -n -e "\e[0;32m#### make completed successfully "

    local ncolors=$(tput colors 2>/dev/null)

    if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then

        color_failed="\e[0;31m"

        color_success="\e[0;32m"

        color_reset="\e[00m"

    else

            echo -n -e "#### make completed successfully "

        color_failed=""

        color_success=""

        color_reset=""

    fi

    echo

    if [ $ret -eq 0 ] ; then

        echo -n -e "${color_success}#### make completed successfully "

    else

        if [ $(uname) != "Darwin" ]; then

            echo -n -e "\e[0;31m#### make failed to build some targets "

        else

            echo -n -e "#### make failed to build some targets "

        fi

        echo -n -e "${color_failed}#### make failed to build some targets "

    fi

    if [ $hours -gt 0 ] ; then

        printf "(%02g:%02g:%02g (hh:mm:ss))" $hours $mins $secs
@@ -1375,9 +1377,7 @@ function make() 
    elif [ $secs -gt 0 ] ; then

        printf "(%s seconds)" $secs

    fi

    if [ $(uname) != "Darwin" ]; then

        echo -e " ####\e[00m"

    fi

    echo -e " ####${color_reset}"

    echo

    return $ret

}