X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=config%2FgenerateTruststoreNRE.sh;h=69a76bef28b4bbfd9486d382b8dd8a4aaca55e39;hp=7747357674d850d6b3753ca53b7e48f2246a7da3;hb=50b8341607e23812216349ef37711e5a85d957c3;hpb=8c78a5b446974b9814a3eeb748659153d1a7bc4c

diff --git a/config/generateTruststoreNRE.sh b/config/generateTruststoreNRE.sh
index 77473576..69a76bef 100755
--- a/config/generateTruststoreNRE.sh
+++ b/config/generateTruststoreNRE.sh
@@ -4,7 +4,8 @@
 rm -f cacerts.jks
 
 function import(){
-  keytool -importcert -keystore ../config/cacerts.jks -file "$1.crt" -alias own -storepass "changeit" -alias "$1" $2
+  name=$1
+  keytool -importcert -keystore ../config/cacerts.jks -file "$1.crt" -alias own -storepass "changeit" -alias "$(basename $name)" $2
 }
 
 function importP(){
@@ -14,12 +15,15 @@ function importP(){
 import ca/root -noprompt
 import ca/assured
 import ca/unassured
+import ca/orga
+import ca/orgaSign
+import ca/codesign
 
-for i in ca/{,un}assured_*; do
+for i in ca/*_*_*; do
   import ${i%.crt}
 done
 
-for i in keys/*.pkcs12; do
+for i in ../keys/*.pkcs12; do
   importP $i
 done