UNIX shell script testing - Fix missing presence of $TERM environment…

… variable. Set default TERM to xterm-basic
noresources · Oct 31, 2024 · 9249c45 · 9249c45
1 parent c2a8fac
commit 9249c45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/resources/xsh/run-tests.body.sh b/resources/xsh/run-tests.body.sh
@@ -30,13 +30,10 @@ NORMAL_COLOR==''
 ERROR_COLOR=''
 SUCCESS_COLOR=''
 
-if [ ! -z "${TERM}" ]
-then 
-	# http://stackoverflow.com/questions/4332478/read-the-current-text-color-in-a-xterm/4332530#4332530
-	NORMAL_COLOR="$(tput sgr0)"
-	ERROR_COLOR="$(tput setaf 1)"
-	SUCCESS_COLOR="$(tput setaf 2)"
-fi
+# http://stackoverflow.com/questions/4332478/read-the-current-text-color-in-a-xterm/4332530#4332530
+NORMAL_COLOR="$(tput -Txterm-basic sgr0)"
+ERROR_COLOR="$(tput -Txterm-basic setaf 1)"
+SUCCESS_COLOR="$(tput -Txterm-basic setaf 2)"
 
 log()
 {

diff --git a/tests/xsh/testprogram.xsl b/tests/xsh/testprogram.xsl
@@ -38,13 +38,11 @@
 			</xsl:with-param>
 		</xsl:call-template>
 		<xsl:value-of select="$sh.endl" />
-		<xsl:text>[ -z "${TERM}" ] &amp;&amp; export TERM=xterm-basic</xsl:text>
+		<xsl:text>NORMAL_COLOR="$(tput -Txterm-basic sgr0)"</xsl:text>
 		<xsl:value-of select="$sh.endl" />
-		<xsl:text>NORMAL_COLOR="$(tput sgr0)"</xsl:text>
+		<xsl:text>ERROR_COLOR="$(tput -Txterm-basic setaf 1)"</xsl:text>
 		<xsl:value-of select="$sh.endl" />
-		<xsl:text>ERROR_COLOR="$(tput setaf 1)"</xsl:text>
-		<xsl:value-of select="$sh.endl" />
-		<xsl:text>SUCCESS_COLOR="$(tput setaf 2)"</xsl:text>
+		<xsl:text>SUCCESS_COLOR="$(tput -Txterm-basic setaf 2)"</xsl:text>
 		<xsl:value-of select="$sh.endl" />
 		<xsl:text>testResultFormat="%-40.40s | %-8s\n"</xsl:text>
 		<xsl:value-of select="$sh.endl" />