zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplification of colouring

Browse Source
This commit is contained in:
mattijs
2008-06-25 09:31:28 +01:00
parent e684296bc1
commit 0178d7268a
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wmake/wmakeScheduler
View File

@ -137,16 +137,6 @@ done
# is returned and not of colouring pipe. # is returned and not of colouring pipe.
set -o pipefail 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; setterm -foreground default)
else
cat
fi
}
colourIndex=0 colourIndex=0
while : while :
@ -164,26 +154,28 @@ do
do do
lockFile="$lockDir/$host:$i" lockFile="$lockDir/$host:$i"
if lockfile -r0 "$lockFile" 2>/dev/null; then if lockfile -r0 "$lockFile" 2>/dev/null; then
if [ "$WM_COLOURS" ]; then
# Set colour # Set colour
colour=${colours[$colourIndex]} colourString=`setterm -foreground ${colours[$colourIndex]}`
## echo "** host=$host colourIndex=$colourIndex colour=$colour"
if [ "$host" = "$HOST" ]; then if [ "$host" = "$HOST" ]; then
if [ "$colour" ]; then eval $* 2>&1 | sed -e "s/^/$colourString/"
eval $* 2>&1 | colourPipe $colour
else
eval $*
fi
elif [ -n "$JOB_ID" ]; then elif [ -n "$JOB_ID" ]; then
qrsh -inherit -v PWD $host "$rcmd" qrsh -inherit -v PWD $host "$rcmd"
else else
if [ "$colour" ]; then ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | sed -e "s/^/$colourString/"
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe $colour fi
retval=$?
else
if [ "$host" = "$HOST" ]; then
eval $*
elif [ -n "$JOB_ID" ]; then
qrsh -inherit -v PWD $host "$rcmd"
else else
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd"
fi fi
fi
retval=$? retval=$?
fi
# Release lock # Release lock
rm -f "$lockFile" 2>/dev/null rm -f "$lockFile" 2>/dev/null