From c7f6481f78d365394004f2f51fae6c328a8aa680 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 18 Apr 2012 13:42:49 +0000 Subject: [PATCH] Install wget earlier. --- .../LB/tests/lb-autonomous-test.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh index e1d6ab7..0ea5c02 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh @@ -37,6 +37,17 @@ EndHelpHeader echo " -h | --help Show this help message." } +egrep -i "Debian|Ubuntu" /etc/issue +if [ \$? = 0 ]; then + INSTALLCMD="apt-get install -q --yes" + INSTALLPKGS="lintian" +else + INSTALLCMD="yum install -q -y --nogpgcheck" + INSTALLPKGS="rpmlint" +fi + +$INSTALLCMD wget + # read common definitions and functions for COMMON in lb-common.sh test-common.sh lb-common-testbeds.sh do @@ -55,17 +66,6 @@ source lb-common-testbeds.sh STARTTIME=`date +%s` -egrep -i "Debian|Ubuntu" /etc/issue -if [ \$? = 0 ]; then - INSTALLCMD="apt-get install -q --yes" - INSTALLPKGS="lintian" -else - INSTALLCMD="yum install -q -y --nogpgcheck" - INSTALLPKGS="rpmlint" -fi - -$INSTALLCMD wget - printf "Getting the 'install' script... " # Example script, for real tests it should be downloaded or otherwise obtained SCENARIO=${SCENARIO:-"Clean installation"} -- 1.8.2.3