Merge "Re-export Simantics/DB/findFreshName from Rename" into release/1.43.1

[simantics/platform.git] / releng / org.simantics.sdk.build.p2.site / sign.sh

diff --git a/releng/org.simantics.sdk.build.p2.site/sign.sh b/releng/org.simantics.sdk.build.p2.site/sign.sh
index 04dc132286ff144ffdaf90924b95b6f791405d57..55815198830ebae528f2c30c1175c414c4c25ce9 100755 (executable)
--- a/releng/org.simantics.sdk.build.p2.site/sign.sh
+++ b/releng/org.simantics.sdk.build.p2.site/sign.sh
@@ -8,7 +8,6 @@ if [ $# -lt 3 ]; then
     echo "<signing property file> must contain the following properties:"
     echo "    jarsigner.alias:     keystore entry alias"
     echo "    jarsigner.storepass: password for the keystore"
-    echo "    jarsigner.keypass:   password for the key <jarsigner.alias>"
     echo ""
     echo "<TSA URL> can be empty is timestamping is not desired."
     exit -1
@@ -19,7 +18,7 @@ signprops=$2
 tsa=$3
 
 function signprop {
-    grep "${1}" ${signprops}|cut -d'=' -f2
+    grep "${1}" "${signprops}"|cut -d'=' -f2
 }
 
 echo "----"
@@ -30,26 +29,23 @@ echo "TSA URL: ${tsa}"
 
 keyalias=$(signprop 'jarsigner.alias')
 storepass=$(signprop 'jarsigner.storepass')
-keypass=$(signprop 'jarsigner.keypass')
 
-for jar in `find ${dir}/target/repository/plugins/ -type f -not -ipath '*.source_*.jar'`; do
+for jar in `find "${dir}/target/repository/plugins/" -type f -not -ipath '*.source_*.jar'`; do
     echo "----"
     if [ -z ${tsa} ]; then
         echo "Signing $jar"
-        jarsigner -keystore ${keystore} \
+        jarsigner -keystore "${keystore}" \
                   -storepass ${storepass} \
-                  -keypass ${keypass} \
                   -verbose \
-                  $jar \
+                  "$jar" \
                   ${keyalias}
     else
         echo "Signing and timestamping $jar"
-        jarsigner -keystore ${keystore} \
+        jarsigner -keystore "${keystore}" \
                   -storepass ${storepass} \
-                  -keypass ${keypass} \
                   -verbose \
                   -tsa "${tsa}" \
-                  $jar \
+                  "$jar" \
                   ${keyalias}
     fi
 done