From faf3d795259e33fe2eb944fb850aee243ceed9dd Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 29 Apr 2008 13:10:19 +0100
Subject: [PATCH] Resetting colour
---
wmake/wmakeScheduler | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/wmake/wmakeScheduler b/wmake/wmakeScheduler
index 3cfe4c37ea9..1bf2d74d8af 100755
--- a/wmake/wmakeScheduler
+++ b/wmake/wmakeScheduler
@@ -134,7 +134,7 @@ set -o pipefail
# Define function to colour output by argument 1
colourPipe(){
if [ "$1" ]; then
- (while read line; do setterm -foreground $1; echo "$line" ; done)
+ (while read line; do setterm -foreground $1; echo "$line" ; done; setterm -foreground default)
else
cat
fi
@@ -173,13 +173,9 @@ do
eval $* 2>&1 | colourPipe $colour
else
eval $*
- fi
- elif [ -n "$JOB_ID" ]; then
- if [ "$colour" ]; then
- qrsh -inherit -v PWD $host "$rcmd" 2>&1 | colourPipe $colour
- else
- qrsh -inherit -v PWD $host "$rcmd"
fi
+ elif [ -n "$JOB_ID" ]; then
+ qrsh -inherit -v PWD $host "$rcmd"
else
if [ "$colour" ]; then
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe $colour
--
GitLab