Change the behaviour of the CA cert and signing policy file locations so as to exclud...

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index ec8304c..168891d 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -485,15 +485,6 @@ function create_all_test {
 
 ############################## main ################################
 
-# check the certificate directory...
-
-if [ -! -z $X509_CERT_DIR ]
-then
-    echo "Certificate directory set to $X509_CERT_DIR";
-else
-    X509_CERT_DIR="/etc/grid-security/certificates";
-    echo "Certificate directory set to $X509_CERT_DIR";
-fi
 if [ "$1" == "--all" ]; then
     CATYPES='trusted fake big expired'
     ALL='yes'
@@ -517,6 +508,16 @@ fi
 
 mkdir -p $TARGETDIR
 
+# check the certificate directory...
+
+X509_CERT_DIR=${TARGETDIR}/grid-security/certificates
+
+if [ ! -d $X509_CERT_DIR ]
+then
+    mkdir -p $X509_CERT_DIR
+fi
+echo "Certificate directory set to $X509_CERT_DIR";
+
 cd $TARGETDIR
 echo "Current directory now: `pwd`"
 echo "Config directory now: ${CONFIGDIR}"