fix: Should print color properly works

- Properly uses private version of function
- Uses `FORCE_COLOR` to override

Author: hyperupcall

pkg/src/public/bash-core.sh

@@ -394,17 +394,9 @@ core.print_debug() {
 # use tput because simple environment variable checking heuristics suffice. Deprecated because this code
 # has been moved to bash-std
 core.should_output_color() {
-	local fd="$1"
-
-	if [[ ${NO_COLOR+x} || "$TERM" = 'dumb' ]]; then
-		return 1
-	fi
-
-	if [ -t "$fd" ]; then
-		return 0
+	if core.private.should_print_color "$@"; then :; else
+		return $?
 	fi
-
-	return 1
 }
 
 # @description (DEPRECATED) Gets information from a particular package. If the key does not exist, then the value

pkg/src/util/util.sh

@@ -79,8 +79,18 @@ core.private.util.err_print() {
 # @internal
 core.private.should_print_color() {
 	local fd="$1"
+	
+	if [ ${NO_COLOR+x} ]; then
+		return 1
+	fi
+
+	if [[ $FORCE_COLOR == @(1|2|3) ]]; then
+		return 0
+	elif [[ $FORCE_COLOR == '0' ]]; then
+		return 1
+	fi
 
-	if [[ ${NO_COLOR+x} || "$TERM" = 'dumb' ]]; then
+	if [ "$TERM" = 'dumb' ]; then
 		return 1
 	fi
 

tests/misc.bats

@@ -15,11 +15,27 @@ load './util/init.sh'
 }
 
 @test "core.should_output_color works" {
-	unset NO_COLOR COLORTERM TERM
+	unset -v NO_COLOR FORCE_COLOR TERM
 
 	NO_COLOR= run core.should_output_color
 	assert_failure
 
+	FORCE_COLOR=0 run core.should_output_color
+	assert_failure
+
+	FORCE_COLOR=1 run core.should_output_color
+	assert_success
+
+	FORCE_COLOR=2 run core.should_output_color
+	assert_success
+
+	FORCE_COLOR=3 run core.should_output_color
+	assert_success
+
+	# NO_COLOR has precedent over FORCE_COLOR
+	NO_COLOR= FORCE_COLOR=1 run core.should_output_color
+	assert_failure
+
 	TERM='dumb' run core.should_output_color
 	assert_failure
 }