From a70e15ee76f6d6d8cf0b83c6c340d75153eeadf2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 28 Jul 2010 14:11:07 +0000 Subject: [PATCH] Handle cases with stty not returning anything --- org.glite.testsuites.ctb/LB/tests/lb-common.sh | 1 + org.glite.testsuites.ctb/LB/tests/test-common.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh index 13ffb8d..d3feaf2 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh @@ -109,6 +109,7 @@ SYS_TAIL=tail SYS_DATE=date SYS_EXPR=expr SYS_BC=bc +SYS_SCP=bc # not used at the moment DEBUG=2 diff --git a/org.glite.testsuites.ctb/LB/tests/test-common.sh b/org.glite.testsuites.ctb/LB/tests/test-common.sh index f0ca470..fe64166 100644 --- a/org.glite.testsuites.ctb/LB/tests/test-common.sh +++ b/org.glite.testsuites.ctb/LB/tests/test-common.sh @@ -50,8 +50,13 @@ export LC_ALL # Seek for terminal size and, if needed, set default size if [ -z "${LINES}" -o -z "${COLUMNS}" ]; then stty_size=`stty size` - LINES=`echo ${stty_size} | awk '{print $1}'` - COLUMNS=`echo ${stty_size} | awk '{print $2}'` + if [ $? = 0 ]; then + LINES=`echo ${stty_size} | awk '{print $1}'` + COLUMNS=`echo ${stty_size} | awk '{print $2}'` + else + LINES=24 + COLUMNS=80 + fi fi if [ ! $LINES -ge 0 ]; then LINES=24; fi if [ ! $COLUMNS -ge 0 ]; then COLUMNS=80; fi -- 1.8.2.3