parallel: --colour-failed: If tput fails, choose some defaults.

This commit is contained in:
Ole Tange 2022-09-22 19:36:58 +02:00
parent edb60d07bd
commit b963066e9e

View file

@ -2607,6 +2607,7 @@ sub parse_options(@) {
if($opt::sqlworker and not $opt::sqlmaster) { if($opt::sqlworker and not $opt::sqlmaster) {
$Global::max_number_of_args = 1; $Global::max_number_of_args = 1;
} }
if($Global::color or $opt::colorfailed) { Job::init_color(); }
} }
sub check_invalid_option_combinations() { sub check_invalid_option_combinations() {
@ -11637,14 +11638,16 @@ sub tag($) {
} @color_combinations; } @color_combinations;
# clr_eol el = clear to end of line # clr_eol el = clear to end of line
$eol = `tput el </dev/tty`; $eol = `sh -c "tput el </dev/tty" 2>/dev/null`;
chomp($eol); chomp($eol);
if($eol eq "") { $eol = "\033[K"; }
# exit_attribute_mode sgr0 = turn off all attributes # exit_attribute_mode sgr0 = turn off all attributes
$reset_color = `tput sgr0 </dev/tty`; $reset_color = `sh -c "tput sgr0 </dev/tty" 2>/dev/null`;
chomp($reset_color); chomp($reset_color);
if($reset_color eq "") { $reset_color = "\033[m"; }
} }
} }
sub color($) { sub color($) {
my $self = shift; my $self = shift;
if(not defined $self->{'color'}) { if(not defined $self->{'color'}) {