From 1074a59d757065e416900bd7f74a4d536944d6cd Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sun, 16 Dec 2018 17:23:26 +0100 Subject: [PATCH] tests/invocation: Set colors after $TERM builds.sr.ht doesn't set $TERM, so this failed. --- tests/invocation.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/invocation.sh b/tests/invocation.sh index 2bfa902ee..5108dd283 100755 --- a/tests/invocation.sh +++ b/tests/invocation.sh @@ -80,16 +80,6 @@ fish_dir="$(dirname "${fish_exe}")" fish_leaf="$(basename "${fish_exe}")" -# Terminal colouring -term_red="$(tput setaf 1)" -term_green="$(tput setaf 2)" -term_yellow="$(tput setaf 3)" -term_blue="$(tput setaf 4)" -term_magenta="$(tput setaf 5)" -term_cyan="$(tput setaf 6)" -term_white="$(tput setaf 7)" -term_reset="$(tput sgr0)" - # Which system are we on. # fish has slightly different behaviour depending on the system it is # running on (and the libraries that it is linked with), so for special @@ -300,6 +290,17 @@ fi clean_environment +# Terminal colouring +# Only do this after setting up $TERM. +term_red="$(tput setaf 1)" +term_green="$(tput setaf 2)" +term_yellow="$(tput setaf 3)" +term_blue="$(tput setaf 4)" +term_magenta="$(tput setaf 5)" +term_cyan="$(tput setaf 6)" +term_white="$(tput setaf 7)" +term_reset="$(tput sgr0)" + say cyan "Testing shell invocation functionality" passed=0