Do not create hard-coded voce dir\nsimpler temporary file name
authorZdeněk Šustr <sustr4@cesnet.cz>
Fri, 24 Feb 2012 11:51:24 +0000 (11:51 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Fri, 24 Feb 2012 11:51:24 +0000 (11:51 +0000)
org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh

index be8d301..9ca94c9 100755 (executable)
@@ -390,20 +390,21 @@ EOF
                fi
 
                printf "Setting up .lsc file and trying again\n"
-               mkdir -p /etc/grid-security/vomsdir/voce/
 
                for vomsfile in /etc/vomses/*
                do
                        VOMSHOSTONLY=`cat $vomsfile | awk '{ print $2 }' | sed 's/"//g'`
                        VOMSHOST=`cat $vomsfile | awk '{ print $2 ":" $3; }' | sed 's/"//g'`
                        VONAME=`cat $vomsfile | awk '{ print $1 }' | sed 's/"//g'`
-                       openssl s_client -connect $VOMSHOST 2>&1 | grep "^depth" | sed 's/^depth=//' | sort -r -n > $VOMSHOST.$$.DNs.txt
-                       VOMSCERT=`tail -n 1 $VOMSHOST.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'`
-                       VOMSCA=`grep -E "^1[ \t]" $VOMSHOST.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'`
+                       openssl s_client -connect $VOMSHOST 2>&1 | grep "^depth" | sed 's/^depth=//' | sort -r -n > $VOMSHOSTONLY.$$.DNs.txt
+                       VOMSCERT=`tail -n 1 $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'`
+                       VOMSCA=`grep -E "^1[ \t]" $VOMSHOSTONLY.$$.DNs.txt | sed -r 's/^[0-9]+\s+//'`
 
                        mkdir -p /etc/grid-security/vomsdir/$VONAME
                        printf "$VOMSCERT\n$VOMSCA\n" > /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc
                        echo Generated /etc/grid-security/vomsdir/$VONAME/$VOMSHOSTONLY.lsc
+
+                       rm $VOMSHOSTONLY.$$.DNs.txt
                done
 
                GRST_CRED_2=`curl --cert /tmp/x509up_u0 --key /tmp/x509up_u0 --capath /etc/grid-security/certificates --silent https://$(hostname -f)/test.cgi|grep GRST_CRED_2`