From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Fri, 24 Feb 2012 10:31:19 +0000 (+0000)
Subject: Fix path
X-Git-Tag: gridsite-core_R_1_7_17~31
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=65a5db3a075ae9fc33f4673198f07d6286dc8347;p=jra1mw.git

Fix path
Cosmetics
---

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
index 25433a5..6f8042c 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
@@ -82,7 +82,7 @@ printf "Getting the 'install' script... "
 # Example script, for real tests it should be downloaded or otherwise obtained
 SCENARIO=${SCENARIO:-"Clean installation"}
 test -s GridSiteInstall.sh || cat << EndInstallScript > GridSiteInstall.sh
-rpm -Uvhi rpm -ivh http://dl.fedoraproject.org/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
+rpm -Uvhi http://dl.fedoraproject.org/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 yum install -y yum-priorities yum-protectbase
 rpm -i http://emisoft.web.cern.ch/emisoft/dist/EMI/1/sl5/x86_64/base/emi-release-1.0.0-1.sl5.noarch.rpm
 
diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
index a066488..33c137e 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-common-testbeds.sh
@@ -57,9 +57,9 @@ HTTPD_CONF=\$HTTPD_CONFDIR/gridsite-webserver.conf
 sed -e '1,\$s!/usr/lib/httpd/modules/!modules/!' /usr/share/doc/gridsite-*/httpd-webserver.conf | sed 's!/var/www/html!/var/www/htdocs!' | sed "s/FULL.SERVER.NAME/\$(hostname -f)/" | sed "s/\(GridSiteGSIProxyLimit\)/# \1/"> \$HTTPD_CONF
 echo "AddHandler cgi-script .cgi" >> \$HTTPD_CONF
 echo "ScriptAlias /gridsite-delegation.cgi /usr/sbin/gridsite-delegation.cgi" >> \$HTTPD_CONF
-mkdir /var/www/htdocs
+mkdir -p /var/www/htdocs
 killall httpd apache2 >/dev/null 2>&1
-sleep 1
+sleep 2
 killall -9 httpd apache2 >/dev/null 2>&1
 echo Starting httpd -f \$HTTPD_CONF
 httpd -f \$HTTPD_CONF