packaging 0.99.53 → 0.99.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a523006ca46cba872305d8cab5c36e6fd2028f1d4e4f49d056c2068563b697
-  data.tar.gz: dea3247fde29b5021c580d7f46787dbd2b1c3afb5c27f15c5f7edc5442bb563b
+  metadata.gz: f0426d622660a35f858b55f26d7d0154d9f8f8877036a545f43a4abab06d5e6b
+  data.tar.gz: 4c9d1c062ee60038e20f2b14bb99526b385f4fb45b5b6c48bfb0d14b5ba5e680
 SHA512:
-  metadata.gz: b51e67a3c0ed94bba73cc93a1612b405394d338a20b9ef6e343a8120b406d04ba1fc8306ff70a6a79d176b5b8143674dd1e5519b31f348ffbc16b9517b05342f
-  data.tar.gz: 4cfedab9f6a7a3de112d23669d91e0d5cdace6b8636bc0df9b71e51c989b0799034eb024a7ec6a94d2346a96f315ac74ffdbaf43d91d3fc34a4e7bb148af1f54
+  metadata.gz: 88c1d2a90d1f3907a6471f1a7f3547ffebce9715a0fa781f33b7acd5c69a564dcdaacbaa231ee0c1cee677ce7808e9e00c724b289bb9f3cc1f9e329a7715c981
+  data.tar.gz: 11b8648321b9488d63e1b3e47786afc147756ccedd56a2e3ad97869e998778ba95a80c0f431fa1bcbe48f5089dbbfd682e2c81450ca49b4133c6b0f97322afcd

data/lib/packaging/platforms.rb

@@ -253,6 +253,11 @@ module Pkg
           package_format: 'dmg',
           repo: false,
         },
+        '10.15' => {
+          architectures: ['x86_64'],
+          package_format: 'dmg',
+          repo: false,
+        },
       },
 
       'redhatfips' => {

data/lib/packaging/sign/msi.rb

@@ -8,10 +8,11 @@ module Pkg::Sign::Msi
     rsync_host_string = "-e 'ssh #{use_identity}' Administrator@#{Pkg::Config.msi_signing_server}"
 
     work_dir = "Windows/Temp/#{Pkg::Util.rand_string}"
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p C:/#{work_dir}")
     msis = Dir.glob("#{target_dir}/windows*/**/*.msi")
-    Pkg::Util::Net.rsync_to(msis.join(" "), rsync_host_string, "/cygdrive/c/#{work_dir}")
-
+    msis.each do | msi |
+      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p C:/#{work_dir}/#{File.dirname(msi)}")
+      Pkg::Util::Net.rsync_to(msi, rsync_host_string, "/cygdrive/c/#{work_dir}/#{File.dirname(msi)}")
+    end
     # Please Note:
     # We are currently adding two signatures to the msi.
     #
@@ -63,7 +64,7 @@ module Pkg::Sign::Msi
     # Once we no longer support Windows 8/Windows Vista, we can remove the
     # first Sha1 signature.
     sign_command = <<-CMD
-for msi in #{msis.map { |d| File.basename(d) }.join(" ")}; do
+for msi in #{msis.map { |d| File.dirname(d) + "/" + File.basename(d) }.join(" ")}; do
   if "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" verify -in "C:/#{work_dir}/$msi" ; then
     echo "$msi is already signed, skipping . . ." ;
   else
@@ -111,7 +112,7 @@ CMD
 
     Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_command, false, '', false)
     msis.each do | msi |
-      Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{File.basename(msi)}", rsync_host_string, File.dirname(msi))
+      Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{File.dirname(msi)}/#{File.basename(msi)}", rsync_host_string, File.dirname(msi))
     end
     Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "if [ -d '/cygdrive/c/#{work_dir}' ]; then rm -rf '/cygdrive/c/#{work_dir}'; fi")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.53
+  version: 0.99.54
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec