Use Bash arrays instead of word splitting

Just in case we ever want to use spaces in any of those places.

diff --git a/collectCRLs b/collectCRLs
index a7818d778cb124d4bcdc3573a55163d8abbb99b2..dc3f7cc56eca04e10e70725226e945e9068861d8 100755 (executable)
--- a/collectCRLs
+++ b/collectCRLs
@@ -23,7 +23,7 @@ for month in {01..12}; do
     BASE=crls-${year}/$year-$month
     mkdir -p $BASE
     cp root.ca/${year}_${month}.crl $BASE/root.crl
-    for ca in $STRUCT_CAS; do
+    for ca in "${STRUCT_CAS[@]}"; do
         cp $ca.ca/${year}_${month}.crl $BASE/$ca.crl
     done
 done

diff --git a/collectGigiConfig b/collectGigiConfig
index 710411596a99d9486e006c972840b2a97c6624f1..27591d282f5212228c090b7c74247b6cd9e834d7 100755 (executable)
--- a/collectGigiConfig
+++ b/collectGigiConfig
@@ -9,9 +9,9 @@ cd generated
 
 mkdir -p gigi-config/config/ca
 cp root.ca/key.crt gigi-config/config/ca/root.crt
-for ca in $STRUCT_CAS; do
+for ca in "${STRUCT_CAS[@]}"; do
     cp ${ca}.ca/key.crt gigi-config/config/ca/${ca}.crt
-    for i in $TIME_IDX; do
+    for i in "${TIME_IDX[@]}"; do
         cp ${year}/ca/${ca}_${year}_${i}.crt gigi-config/config/ca/${ca}_${year}_${i}.crt
     done
 done

diff --git a/collectSignerConfig b/collectSignerConfig
index f00b0880f7555e36b63539482b9f2bb1457377cb..b8e0f91270753262a1e1d0ea0007afbfc00596a2 100755 (executable)
--- a/collectSignerConfig
+++ b/collectSignerConfig
@@ -8,8 +8,8 @@ year=$1
 cd generated
 
 mkdir -p signer-config
-for ca in $STRUCT_CAS; do
-    for i in $TIME_IDX; do
+for ca in "${STRUCT_CAS[@]}"; do
+    for i in "${TIME_IDX[@]}"; do
         mkdir -p signer-config/ca/${ca}_${year}_${i}
         cp ${year}/ca/${ca}_${year}_${i}.crt  signer-config/ca/${ca}_${year}_${i}/ca.crt
     done
@@ -19,8 +19,8 @@ tar czf signer-client-$year.tar.gz -C .. profiles -C generated/signer-config ca
 
 # Updating for server
 
-for ca in $STRUCT_CAS; do
-    for i in $TIME_IDX; do
+for ca in "${STRUCT_CAS[@]}"; do
+    for i in "${TIME_IDX[@]}"; do
         cp ${year}/ca/${ca}_${year}_${i}.key  signer-config/ca/${ca}_${year}_${i}/ca.key
     done
 done

diff --git a/generateCRLs b/generateCRLs
index ff2338b7b9b745ce8517d504d764a5be7516b0bc..5d9089479769da99955586287f5e634489192da8 100755 (executable)
--- a/generateCRLs
+++ b/generateCRLs
@@ -43,6 +43,6 @@ generateYearCRLs (){ #name idx
     done
 }
 generateCRLs root
-for ca in $STRUCT_CAS; do
+for ca in "${STRUCT_CAS[@]}"; do
     generateCRLs $ca
 done

diff --git a/generateHtdocs b/generateHtdocs
index 78a09768cefed2f634ac988ea2562fa6345ec549..3a039f20d80b01a7d7c1b7fe3e59f2cdc03ac4d9 100755 (executable)
--- a/generateHtdocs
+++ b/generateHtdocs
@@ -8,12 +8,12 @@ cd generated
 
 mkdir -p htdocs/crt/g2/$year
 
-for ca in root $STRUCT_CAS; do
+for ca in root "${STRUCT_CAS[@]}"; do
     cp $ca.ca/key.crt htdocs/crt/g2/$ca.crt
 done
 
-for ca in $STRUCT_CAS; do
-    for i in $TIME_IDX; do
+for ca in "${STRUCT_CAS[@]}"; do
+    for i in "${TIME_IDX[@]}"; do
         cp $year/ca/${ca}_${year}_${i}.crt htdocs/crt/g2/$year/${ca}-${i}.crt
     done
 done

diff --git a/generateKeys b/generateKeys
index d978bfb95b6de4144713c1417f3baebb5a3b4209..321be23f493a82c99280101d2df12781d9030585 100755 (executable)
--- a/generateKeys
+++ b/generateKeys
@@ -56,7 +56,7 @@ genca "/CN=Cacert-gigi testCA" root
 rootSign root
 
 # generate the various sub-CAs
-for ca in $STRUCT_CAS; do
+for ca in "${STRUCT_CAS[@]}"; do
     . ../CAs/$ca
     genca "/CN=$name" $ca
     rootSign $ca

diff --git a/generateTime b/generateTime
index d5e8553151499e41fa4a51f6d6b31bbc0dcae4c0..6f2572dee22e034ac92f5c22d08cdfeb56ded04d 100755 (executable)
--- a/generateTime
+++ b/generateTime
@@ -35,7 +35,7 @@ TESTCA
 mkdir -p $year/ca
 
 
-for i in $TIME_IDX; do
+for i in "${TIME_IDX[@]}"; do
     point=${year}${points[${i}]}
     nextp=${points[$((${i} + 1))]}
     if [[ "$nextp" == "" ]]; then
@@ -44,7 +44,7 @@ for i in $TIME_IDX; do
         epoint=$((${year} + 2 ))${epoints[${i}]}
     fi
 
-    for ca in $STRUCT_CAS; do
+    for ca in "${STRUCT_CAS[@]}"; do
         . ../CAs/$ca
         genKey "/CN=$name ${year}-${i}" $year/ca/${ca}_${year}_${i}
         genTimeCA $year/ca/${ca}_${year}_${i} $ca "$point" "$epoint"

diff --git a/structure.bash b/structure.bash
index 3657f07a40fd6f4ad4501056eb617d07b92bd2b2..57426b11d9ff68a8914f37f05f49529145308d50 100644 (file)
--- a/structure.bash
+++ b/structure.bash
@@ -5,9 +5,9 @@ PRIVATEPW="changeit"
 
 [ -f config ] && . ./config
 
-STRUCT_CAS="env unassured assured codesign orga orgaSign"
-SERVER_KEYS="api secure www static signer_server signer_client mail"
-TIME_IDX="1 2"
+STRUCT_CAS=(env unassured assured codesign orga orgaSign)
+SERVER_KEYS=(api secure www static signer_server signer_client mail)
+TIME_IDX=(1 2)
 points[1]="0101000000Z"
 points[2]="0601000000Z"
 

diff --git a/verify b/verify
index 092e52eed7ba732a222ccd1a07b3a7cc8cf6baa2..6e977098aedba5f77fc882685204a9767193f099 100755 (executable)
--- a/verify
+++ b/verify
@@ -42,14 +42,14 @@ verify root.ca/key.crt
 verifyExtlist "$(openssl x509 -in "root.ca/key.crt" -noout -text)" root
 
 # Verify level-1 structure
-for ca in $STRUCT_CAS; do
+for ca in "${STRUCT_CAS[@]}"; do
     verify $ca.ca/key.crt
     verifyExtlist "$(openssl x509 -in "$ca.ca/key.crt" -noout -text)" "$ca"
 done
 
 # Verify level-2 (time) structure
-for ca in ${STRUCT_CAS}; do
-    for i in $TIME_IDX; do
+for ca in "${STRUCT_CAS[@]}"; do
+    for i in "${TIME_IDX[@]}"; do
         . ../CAs/$ca
         CA_FILE=$year/ca/${ca}_${year}_${i}.crt
         time=${points[${i}]}