Separate .zip and .ziphash.sig steps for assurrance

diff --git a/mk-mod b/mk-mod
index 6fb58f6951c81a767bbd8677cf20f4ab4c5ba4950f0bc37998106b96dcf5ced3..dda8450773a2dc47c1f98fc77496ab862ef99ca70e3547fe4b38113476097d34 100755 (executable)
--- a/mk-mod
+++ b/mk-mod
@@ -6,7 +6,6 @@ vcsurl=$1
 vcspath=$2
 modname=$3
 version=$4
-signkey=$5
 
 dst=$modname/@v
 mkdir -p $dst
@@ -33,9 +32,4 @@ $ziphash $version.zip > $version.ziphash
 unzip -p $version.zip ${modname}@${version}/go.mod > $version.mod
 printf '{"Version":"%s","Time":"%s","Origin":{"VCS":"git","URL":"%s","Ref":"refs/tags/%s","Hash":"%s"}}' \
     $version $when $vcsurl $version $hsh > $version.info
-totouch=($version.info $version.mod $version.zip $version.ziphash)
-[[ -z $signkey ]] || {
-    ssh-keygen -Y sign -f $signkey -n file $version.ziphash
-    totouch=($totouch $version.ziphash.sig)
-}
-touch -d $when $totouch
+touch -d $when $version.info $version.mod $version.zip $version.ziphash

diff --git a/mk-mods b/mk-mods
index 8f565116465249605a8975aacd2089b35f22588aa2262a572942c9f9364a5f0a..23aaff2009d466da8e22cc20cc8abc4006b136cc8edee2c5e441f5e43ce6b3f7 100755 (executable)
--- a/mk-mods
+++ b/mk-mods
@@ -8,5 +8,6 @@ modbase=$3
 signkey=$4
 
 $root/list-vers $vcspath $modbase | while IFS=" " read modname version ; do
-    $root/mk-mod $vcsurl $vcspath $modname $version $signkey
+    $root/mk-mod $vcsurl $vcspath $modname $version
+    $root/mk-mod-sig $modname $version $signkey
 done