From: František Dvořák Date: Fri, 1 Feb 2013 16:07:03 +0000 (+0000) Subject: Headers on Fedora. X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=851050d9fc766e96f1898f910699ae0fe0829df6;p=jra1mw.git Headers on Fedora. --- diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh index 3376d13..e18d164 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh @@ -189,14 +189,14 @@ function gen_deployment_header() DURATION=`expr $1 - $2` SCENARIO="$3" -ISSUE=`cat /etc/issue | head -n 1 | sed -r 's/[\\\r].*$//'` +ISSUE=`cat /etc/issue | head -n 1 | sed -r 's/\s*(release|\\\\).*$//'` PLATFORM=`uname -i` if [ "$PLATFORM" == "unknown" ]; then PLATFORM="`uname -sr`" fi TESTBED=`hostname -f` DISTRO=`cat /etc/issue | head -n 1 | sed 's/\s.*$//'` -VERSION=`cat /etc/issue | head -n 1 | grep -E -o "[0-9]+\.[0-9]+"` +VERSION=`cat /etc/issue | head -n 1 | grep -E -o "[0-9]+(\.[0-9]+)?"` MAJOR=`echo $VERSION | sed 's/\..*$//'` printf "