From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Mon, 27 Feb 2012 09:50:51 +0000 (+0000)
Subject: Correct grep
X-Git-Tag: gridsite-core_R_1_7_17~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a18bf41b2dfe3a60ead602441c5e42b29d15d35d;p=jra1mw.git

Correct grep
---

diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
index 5d17b08..5b1f413 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh
@@ -391,10 +391,12 @@ EOF
 
 		printf "Setting up .lsc file and trying again\n"
 
-		UTOPIA=`voms-proxy-info -all | grep -A 100 "extension information" | grep "^issuer" | grep utopia`
+		UTOPIA=`voms-proxy-info -all | grep -A 100 "extension information" | grep "^issuer" | grep "L=Tropic" | grep "O=Utopia" | grep "OU=Relaxation"`
 		if [ $UTOPIA != "" ]; then
 			printf "Possibly fake VOMS extensions. Regenerating..."
-			voms-proxy-init -voms vo.org -key $x509_USER_KEY -cert $x509_USER_CERT | grep -A 100 "extension information" 
+			voms-proxy-info | grep -A 100 "extension information" 
+			voms-proxy-init -voms vo.org -key $x509_USER_KEY -cert $x509_USER_CERT
+			voms-proxy-info | grep -A 100 "extension information" 
 		fi;
 
 		for vomsfile in /etc/vomses/*