[Scummvm-cvs-logs] scummvm master -> 22b453c4b2621eb9b6edc1b759e6406c923f20c2
lordhoto
lordhoto at gmail.com
Thu Feb 18 11:45:47 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
22b453c4b2 OPENPANDORA: Fix op-pnd target when no TERM is set.
Commit: 22b453c4b2621eb9b6edc1b759e6406c923f20c2
https://github.com/scummvm/scummvm/commit/22b453c4b2621eb9b6edc1b759e6406c923f20c2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-18T11:44:53+01:00
Commit Message:
OPENPANDORA: Fix op-pnd target when no TERM is set.
Changed paths:
dists/openpandora/pnd_make.sh
diff --git a/dists/openpandora/pnd_make.sh b/dists/openpandora/pnd_make.sh
index 0c03e81..202f137 100755
--- a/dists/openpandora/pnd_make.sh
+++ b/dists/openpandora/pnd_make.sh
@@ -41,9 +41,16 @@ cecho () # Color-echo. Argument $1 = message, Argument $2 = color
{
local default_msg="No message passed." # Doesn't really need to be a local variable.
message=${1:-$default_msg} # Defaults to default message.
- color=${2:-$black} # Defaults to black, if not specified.
- echo -e "$color$message"
- tput sgr0 # Reset to normal.
+
+ # We only output colors when a TERM environment variable is set. This
+ # fixes execution of the script on buildbot, which does not have this set.
+ if [ -z "$TERM" ]; then
+ echo "$message"
+ else
+ color=${2:-$black} # Defaults to black, if not specified.
+ echo -e "$color$message"
+ tput sgr0 # Reset to normal.
+ fi
return
}
More information about the Scummvm-git-logs
mailing list