packaging 0.106.0 → 0.106.1

data/lib/packaging/config/validations.rb

@@ -1,8 +1,6 @@
 module Pkg
   class ConfigValidations
-
     class << self
-
       # As a validation, this one is kindof lame but is intended as a seed pattern for possibly
       # more robust ones.
       def not_empty?(value)

data/lib/packaging/config.rb

@@ -81,11 +81,11 @@ module Pkg
         dir = "/opt/jenkins-builds/#{self.project}/#{self.ref}"
         cmd = "if [ -s \"#{dir}/artifacts\" ]; then cd #{dir};"\
               "find ./artifacts -mindepth 2 -type f; fi"
-        artifacts, _ = Pkg::Util::Net.remote_execute(
-                     self.builds_server,
+        artifacts, = Pkg::Util::Net.remote_execute(
+          self.builds_server,
                      cmd,
                      { capture_output: true }
-                   )
+        )
 
         artifacts = artifacts.split("\n")
         data = {}
@@ -118,8 +118,8 @@ module Pkg
           if platform == 'solaris'
             next if version == '10' && File.extname(artifact) != '.gz'
             next if version == '11' && File.extname(artifact) != '.p5p'
-          else
-            next if File.extname(artifact) != ".#{package_format}"
+          elsif File.extname(artifact) != ".#{package_format}"
+            next
           end
 
           # Don't want to include debian debug packages
@@ -231,8 +231,8 @@ module Pkg
       # the debian changelog.
       #
       def cow_list
-        self.cows.split(' ').map do
-          |cow| cow.split('-')[1]
+        self.cows.split(' ').map do |cow|
+          cow.split('-')[1]
         end.uniq.join(' ')
       end
 
@@ -426,7 +426,7 @@ module Pkg
       def string_to_array(str)
         delimiters = /[,\s;]/
         return str if str.respond_to?('each')
-        str.split(delimiters).reject { |s| s.empty? }.map { |s| s.strip }
+        str.split(delimiters).reject(&:empty?).map(&:strip)
       end
 
       # This method is duplicated from enterprise-dist so we can access it here.

data/lib/packaging/deb/repo.rb

@@ -2,9 +2,7 @@
 require 'fileutils'
 
 module Pkg::Deb::Repo
-
   class << self
-
     # This is the default set of arches we are using for our reprepro repos. We
     # take this list and combine it with the list of supported arches for each
     # given platform to ensure a complete set of architectures. We use this
@@ -43,7 +41,7 @@ module Pkg::Deb::Repo
       # First test if the directory even exists
       #
       begin
-        stdout, _, _ = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{repo_base} 2>&1")
+        stdout, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{repo_base} 2>&1")
       rescue RuntimeError
         warn "No debian repos available for #{Pkg::Config.project} at #{Pkg::Config.ref}."
         return
@@ -62,7 +60,7 @@ module Pkg::Deb::Repo
         # We want to skip the base_url, which wget returns as one of the results
         next if "#{url}/" == repo_base
         platform_tag = Pkg::Paths.tag_from_artifact_path(url)
-        platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+        platform, version, = Pkg::Platforms.parse_platform_tag(platform_tag)
         codename = Pkg::Platforms.codename_for_platform_version(platform, version)
         repoconfig = ["# Packages for #{Pkg::Config.project} built from ref #{Pkg::Config.ref}",
                       "deb #{url} #{codename} #{reprepro_repo_name}"]
@@ -76,9 +74,9 @@ module Pkg::Deb::Repo
       wget = Pkg::Util::Tool.check_tool("wget")
       FileUtils.mkdir_p("pkg/#{target}")
       config_url = "#{base_url}/#{target}/deb/"
-      stdout, _, _ = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
+      stdout, = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
       stdout
-    rescue => e
+    rescue StandardError => e
       fail "Couldn't retrieve deb apt repo configs.\n#{e}"
     end
 
@@ -95,13 +93,13 @@ module Pkg::Deb::Repo
 
       artifact_paths.each do |path|
         platform_tag = Pkg::Paths.tag_from_artifact_path(path)
-        platform, version, _ = Pkg::Platforms. parse_platform_tag(platform_tag)
+        platform, version, = Pkg::Platforms. parse_platform_tag(platform_tag)
         codename = Pkg::Platforms.codename_for_platform_version(platform, version)
         arches = Pkg::Platforms.arches_for_codename(codename)
 
         cmd << "mkdir -p #{codename}/conf && "
         cmd << "pushd #{codename} ; "
-        cmd << %Q( [ -e 'conf/distributions' ] || echo "
+        cmd << %( [ -e 'conf/distributions' ] || echo "
 Origin: Puppet Labs
 Label: Puppet Labs
 Codename: #{codename}
@@ -139,7 +137,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
     end
 
     def ship_repo_configs(target = "repo_configs")
-      if (!File.exist?("pkg/#{target}/deb")) || Pkg::Util::File.empty_dir?("pkg/#{target}/deb")
+      if !File.exist?("pkg/#{target}/deb") || Pkg::Util::File.empty_dir?("pkg/#{target}/deb")
         warn "No repo configs have been generated! Try pl:deb_repo_configs."
         return
       end
@@ -178,7 +176,7 @@ Description: #{message} for #{dist}
 SignWith: #{Pkg::Config.gpg_key}"
           end
 
-          stdout, _, _ = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
+          stdout, = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
           stdout
         end
       end
@@ -204,7 +202,7 @@ SignWith: #{Pkg::Config.gpg_key}"
       # You may think "rsync doesn't actually remove the sticky bit, let's
       # remove the Dugo-s from the chmod". However, that will make your rsyncs
       # fail due to permission errors.
-      options = %w(
+      options = %w[
         rsync
         --itemize-changes
         --hard-links
@@ -222,14 +220,14 @@ SignWith: #{Pkg::Config.gpg_key}"
         --no-group
         --exclude='dists/*-*'
         --exclude='pool/*-*'
-      )
+      ]
 
       options << '--dry-run' if dryrun
       options << path
       if !destination.nil?
         options << "#{destination}:#{dest_path.parent}"
       else
-        options << "#{dest_path.parent}"
+        options << dest_path.parent.to_s
       end
       options.join("\s")
     end
@@ -259,6 +257,5 @@ SignWith: #{Pkg::Config.gpg_key}"
         Pkg::Util::Net.remote_execute(destination_server, cp_command)
       end
     end
-
   end
 end

data/lib/packaging/gem.rb

@@ -21,7 +21,7 @@ module Pkg::Gem
         data['number'] == gem_version && data['platform'] == gem_platform
       end
       return !gem.empty?
-    rescue => e
+    rescue StandardError => e
       puts "Something went wrong searching for gem '#{gem_name}':"
       puts e
       puts "Perhaps you're shipping '#{gem_name}' for the first time?"
@@ -49,7 +49,7 @@ module Pkg::Gem
       gem_push_command << " --host #{options[:host]}" if options[:host]
       gem_push_command << " --key #{options[:key]}" if options[:key]
       Pkg::Util::Execution.capture3(gem_push_command)
-    rescue => e
+    rescue StandardError => e
       puts "###########################################"
       puts "#  Publishing to rubygems failed. Make sure your .gem/credentials"
       puts "#  file is set up and you are an owner of #{Pkg::Config.gem_name}"

data/lib/packaging/metrics.rb

@@ -3,13 +3,13 @@ module Pkg::Metrics
 
   def update_release_metrics
     metrics_repo = 'release-metrics'
-    command = <<CMD
-git clone git@github.com:puppetlabs/#{metrics_repo}.git
-cd #{metrics_repo}
-bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
-cd ..
-rm -r #{metrics_repo}
-CMD
+    command = <<~CMD
+      git clone git@github.com:puppetlabs/#{metrics_repo}.git
+      cd #{metrics_repo}
+      bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
+      cd ..
+      rm -r #{metrics_repo}
+    CMD
     Pkg::Util::Execution.capture3(command, true)
   end
 end

data/lib/packaging/nuget.rb

@@ -32,7 +32,6 @@ module Pkg::Nuget
           stdout, retval = Pkg::Util::Net.curl_form_data("#{uri}/#{package_path}", form_data + package_form_data)
         end
         fail "The Package upload (curl) failed with error #{retval}" unless Pkg::Util::Execution.success?(retval)
-        stdout
       end
     end
   end

data/lib/packaging/paths.rb

@@ -2,7 +2,6 @@
 # This includes both reporting the correct path and divining the platform
 # tag associated with a variety of paths
 #
-# rubocop:disable Metrics/ModuleLength
 module Pkg::Paths
   include Pkg::Platforms
 
@@ -17,7 +16,7 @@ module Pkg::Paths
       return Pkg::Platforms.get_attribute_for_platform_version(platform, version, :source_architecture)
     end
     arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
-  rescue
+  rescue StandardError
     arches.find { |a| path.include?(package_arch(platform, a)) } || arches[0]
   end
 
@@ -40,7 +39,7 @@ module Pkg::Paths
     arch = arch_from_artifact_path(platform, version, path)
 
     return "#{platform}-#{version}-#{arch}"
-  rescue
+  rescue StandardError
     fmt = Pkg::Platforms.all_supported_package_formats.find { |ext| path =~ /#{ext}$/ }
 
     # We need to make sure this is actually a file, and not simply a path
@@ -117,7 +116,7 @@ module Pkg::Paths
 
       # In puppet7 and beyond, we moved the repo_name to the top to allow each
       # puppet major release to have its own apt repo.
-      if %w(FUTURE-puppet7 FUTURE-puppet7-nightly).include? repo_name
+      if %w[FUTURE-puppet7 FUTURE-puppet7-nightly].include? repo_name
         return File.join(prefix, apt_repo_name(is_nonfinal), debian_code_name)
       end
 
@@ -170,7 +169,7 @@ module Pkg::Paths
   # Given platform information, create symlink target (base_path) and link path in the
   # form of a 2-element array
   def artifacts_base_path_and_link_path(platform_tag, prefix = 'artifacts', is_nonfinal = false)
-    platform_name, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+    platform_name, = Pkg::Platforms.parse_platform_tag(platform_tag)
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
 
     path_data = {
@@ -189,7 +188,7 @@ module Pkg::Paths
   end
 
   def artifacts_path(platform_tag, path_prefix = 'artifacts', nonfinal = false)
-    base_path, _ = artifacts_base_path_and_link_path(platform_tag, path_prefix, nonfinal)
+    base_path, = artifacts_base_path_and_link_path(platform_tag, path_prefix, nonfinal)
     platform, version, architecture = Pkg::Platforms.parse_platform_tag(platform_tag)
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
 
@@ -306,24 +305,24 @@ module Pkg::Paths
       fail "Can't determine path for non-debian platform #{platform_tag}."
     end
 
-    platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+    platform, version, = Pkg::Platforms.parse_platform_tag(platform_tag)
     code_name = Pkg::Platforms.codename_for_platform_version(platform, version)
     remote_repo_path = remote_repo_base(platform_tag, nonfinal: nonfinal)
 
     # In puppet7 and beyond, we moved the puppet major version to near the top to allow each
     # puppet major release to have its own apt repo, for example:
     # /opt/repository/apt/puppet7/pool/bionic/p/puppet-agent
-    if %w(FUTURE-puppet7 FUTURE-puppet7-nightly).include? repo_name
+    if %w[FUTURE-puppet7 FUTURE-puppet7-nightly].include? repo_name
       return File.join(remote_repo_path, repo_name, 'pool', code_name, project[0], project)
     end
 
     # For repos prior to puppet7, the puppet version was part of the repository
     # For example: /opt/repository/apt/pool/bionic/puppet6/p/puppet-agent
-    if %w(puppet7 puppet7-nightly
+    if %w[puppet7 puppet7-nightly
           puppet6 puppet6-nightly
           puppet5 puppet5-nightly
-          puppet  puppet-nightly
-          puppet-tools).include? repo_name
+          puppet puppet-nightly
+          puppet-tools].include? repo_name
       return File.join(remote_repo_path, 'pool', code_name, repo_name, project[0], project)
     end
 
@@ -331,7 +330,7 @@ module Pkg::Paths
   end
 
   def release_package_link_path(platform_tag, nonfinal = false)
-    platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+    platform, version, = Pkg::Platforms.parse_platform_tag(platform_tag)
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
     case package_format
     when 'rpm'
@@ -372,5 +371,4 @@ module Pkg::Paths
   end
 
   private :package_arch
-
 end

data/lib/packaging/platforms.rb

@@ -4,7 +4,6 @@ require 'set'
 # explicitly supports
 module Pkg
   module Platforms
-
     module_function
 
     DEBIAN_SOURCE_FORMATS = ['debian.tar.gz', 'orig.tar.gz', 'dsc', 'changes']
@@ -113,6 +112,11 @@ module Pkg
           package_format: 'dmg',
           repo: false,
         },
+        '12' => {
+          architectures: ['x86_64', 'arm64'],
+          package_format: 'dmg',
+          repo: false,
+        },
       },
 
       'redhatfips' => {
@@ -223,7 +227,7 @@ module Pkg
           repo: false,
         }
       },
-    }.freeze
+    }
 
     # @return [Array] An array of Strings, containing all of the supported
     #   platforms as defined in PLATFORM_INFO
@@ -235,7 +239,7 @@ module Pkg
     #   versions for the given platform
     def versions_for_platform(platform)
       PLATFORM_INFO[platform].keys
-    rescue
+    rescue StandardError
       raise "No information found for '#{platform}'"
     end
 
@@ -277,7 +281,7 @@ module Pkg
       # AIX uses 'ppc' as its architecture in paths and file names
       architecture = 'ppc' if platform == 'aix'
       return [platform, version, architecture]
-    rescue
+    rescue StandardError
       raise "Could not verify that '#{platform_tag}' is a valid tag"
     end
 
@@ -286,7 +290,7 @@ module Pkg
     #   platform-version-arch
     # @return [Hash] The hash of data associated with the given platform version
     def platform_lookup(platform_tag)
-      platform, version, _ = parse_platform_tag(platform_tag)
+      platform, version, = parse_platform_tag(platform_tag)
       PLATFORM_INFO[platform][version]
     end
 
@@ -396,7 +400,7 @@ module Pkg
       if include_source
         begin
           source_architecture = Array(get_attribute_for_platform_version(platform, version, :source_architecture))
-        rescue
+        rescue StandardError # rubocop:disable Lint/SuppressedException
         end
       end
       return (platform_architectures + source_architecture).flatten

data/lib/packaging/repo.rb

@@ -1,7 +1,5 @@
 module Pkg::Repo
-
   class << self
-
     ##
     ## Construct a local_target based upon the versioning style
     ##
@@ -38,7 +36,7 @@ module Pkg::Repo
         target_tarball = File.join('repos', "#{archive_name}.tar.gz")
         tar_command = %W[#{tar} --owner=0 --group=0 --create --gzip
           --file #{target_tarball} #{repo_location}].join(' ')
-        stdout, _, _ = Pkg::Util::Execution.capture3(tar_command)
+        stdout, = Pkg::Util::Execution.capture3(tar_command)
         return stdout
       end
     end
@@ -69,7 +67,7 @@ module Pkg::Repo
         tar_command = %W[#{tar} --owner=0 --group=0 #{tar_action}
           --file #{all_repos_tarball_name} #{repo_tarball_path}].join(' ')
 
-        stdout, _, _ = Pkg::Util::Execution.capture3(tar_command)
+        stdout, = Pkg::Util::Execution.capture3(tar_command)
         puts stdout
       end
     end
@@ -82,7 +80,7 @@ module Pkg::Repo
       gzip = Pkg::Util::Tool.check_tool('gzip')
 
       gzip_command = "#{gzip} --fast #{all_repos_tarball_name}"
-      stdout, _, _ = Pkg::Util::Execution.capture3(gzip_command)
+      stdout, = Pkg::Util::Execution.capture3(gzip_command)
       puts stdout
     end
 
@@ -111,13 +109,13 @@ module Pkg::Repo
       cmd = "[ -d #{artifact_directory} ] || exit 1 ; "
       cmd << "pushd #{artifact_directory} > /dev/null && "
       cmd << "find . -name '*.#{pkg_ext}' -print0 | xargs --no-run-if-empty -0 -I {} dirname {} "
-      stdout, _ = Pkg::Util::Net.remote_execute(
-                Pkg::Config.distribution_server,
+      stdout, = Pkg::Util::Net.remote_execute(
+        Pkg::Config.distribution_server,
                 cmd,
                 { capture_output: true }
-              )
+      )
       return stdout.split
-    rescue => e
+    rescue StandardError => e
       fail "Error: Could not retrieve directories that contain #{pkg_ext} " \
            "packages in #{Pkg::Config.distribution_server}:#{artifact_directory}: #{e}"
     end
@@ -127,7 +125,7 @@ module Pkg::Repo
       cmd << "pushd #{artifact_parent_directory} > /dev/null && "
       cmd << 'rsync --archive --verbose --one-file-system --ignore-existing artifacts/ repos/ '
       Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, cmd)
-    rescue => e
+    rescue StandardError => e
       fail "Error: Could not populate repos directory in " \
            "#{Pkg::Config.distribution_server}:#{artifact_parent_directory}: #{e}"
     end
@@ -138,7 +136,7 @@ module Pkg::Repo
 
     def update_repo(remote_host, command, options = {})
       fail_message = "Error: Missing required argument '%s', perhaps update build_defaults?"
-      [:repo_name, :repo_path, :repo_host, :repo_url].each do |option|
+      %i[repo_name repo_path repo_host repo_url].each do |option|
         fail fail_message % option.to_s if argument_required?(option.to_s, command) && !options[option]
       end
 
@@ -152,7 +150,8 @@ module Pkg::Repo
       }
       Pkg::Util::Net.remote_execute(
         remote_host,
-        Pkg::Util::Misc.search_and_replace(command, repo_configuration))
+        Pkg::Util::Misc.search_and_replace(command, repo_configuration)
+      )
     end
   end
 end

data/lib/packaging/retrieve.rb

@@ -67,7 +67,7 @@ module Pkg::Retrieve
       warn "Could not find `wget` tool. Falling back to rsyncing from #{Pkg::Config.distribution_server}."
       begin
         Pkg::Util::Net.rsync_from("#{rsync_path}/", Pkg::Config.distribution_server, "#{local_target}/")
-      rescue => e
+      rescue StandardError => e
         fail "Couldn't rsync packages from distribution server.\n#{e}"
       end
     end

data/lib/packaging/rpm/repo.rb

@@ -75,7 +75,7 @@ module Pkg::Rpm::Repo
       path = Pathname.new(origin_path)
       dest_path = Pathname.new(destination_path)
 
-      options = %w(
+      options = %w[
         rsync
         --recursive
         --links
@@ -91,7 +91,7 @@ module Pkg::Rpm::Repo
         --no-perms
         --no-owner
         --no-group
-      )
+      ]
 
       options << '--dry-run' if dryrun
       options << path
@@ -99,7 +99,7 @@ module Pkg::Rpm::Repo
       if destination
         options << "#{destination}:#{dest_path.parent}"
       else
-        options << "#{dest_path.parent}"
+        options << dest_path.parent.to_s
       end
 
       options.join("\s")
@@ -117,9 +117,9 @@ module Pkg::Rpm::Repo
       FileUtils.mkdir_p("pkg/#{target}")
       config_url = "#{base_url}/#{target}/rpm/"
       begin
-        stdout, _, _ = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
+        stdout, = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
         stdout
-      rescue => e
+      rescue StandardError => e
         fail "Couldn't retrieve rpm yum repo configs.\n#{e}"
       end
     end
@@ -149,7 +149,7 @@ module Pkg::Rpm::Repo
       # repodata folders in them, and second that those same directories also
       # contain rpms
       #
-      stdout, _, _ = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 5 --no-parent #{repo_base} 2>&1")
+      stdout, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 5 --no-parent #{repo_base} 2>&1")
       stdout = stdout.split.uniq.reject { |x| x =~ /\?|index/ }.select { |x| x =~ /http:.*repodata\/$/ }
 
       # RPMs will always exist at the same directory level as the repodata
@@ -157,7 +157,7 @@ module Pkg::Rpm::Repo
       #
       yum_repos = []
       stdout.map { |x| x.chomp('repodata/') }.each do |url|
-        output, _, _ = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{url} 2>&1")
+        output, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{url} 2>&1")
         unless output.split.uniq.reject { |x| x =~ /\?|index/ }.select { |x| x =~ /http:.*\.rpm$/ }.empty?
           yum_repos << url
         end
@@ -204,7 +204,7 @@ module Pkg::Rpm::Repo
     end
 
     def create_local_repos(directory = "repos")
-      stdout, _, _ = Pkg::Util::Execution.capture3("bash -c '#{repo_creation_command(directory)}'")
+      stdout, = Pkg::Util::Execution.capture3("bash -c '#{repo_creation_command(directory)}'")
       stdout
     end
 

data/lib/packaging/sign/dmg.rb

@@ -8,25 +8,25 @@ module Pkg::Sign::Dmg
     end
 
     host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
-    host_string = "#{Pkg::Config.osx_signing_server}" if Pkg::Config.osx_signing_server =~ /@/
+    host_string = Pkg::Config.osx_signing_server.to_s if Pkg::Config.osx_signing_server =~ /@/
 
     ssh_host_string = "#{use_identity} #{host_string}"
     rsync_host_string = "-e 'ssh #{use_identity}' #{host_string}"
-    archs =  Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/{x86_64,arm64}").map { |el| el.split('/').last }
+    archs = Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/{x86_64,arm64}").map { |el| el.split('/').last }
 
     if archs.empty?
-      $stderr.puts "Error: no architectures found in #{pkg_directory}/{apple,mac,osx}"
+      warn "Error: no architectures found in #{pkg_directory}/{apple,mac,osx}"
       exit 1
     end
 
     archs.each do |arch|
       remote_working_directory = "/tmp/#{Pkg::Util.rand_string}/#{arch}"
       dmg_mount_point = File.join(remote_working_directory, "mount")
-      signed_items_directory    = File.join(remote_working_directory, "signed")
+      signed_items_directory = File.join(remote_working_directory, "signed")
 
       dmgs = Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/#{arch}/*.dmg")
       if dmgs.empty?
-        $stderr.puts "Error: no dmgs found in #{pkg_directory}/{apple,mac,osx} for #{arch} architecture."
+        warn "Error: no dmgs found in #{pkg_directory}/{apple,mac,osx} for #{arch} architecture."
         exit 1
       end
 
@@ -43,7 +43,7 @@ module Pkg::Sign::Dmg
           for pkg in #{dmg_mount_point}/*.pkg; do
             pkg_basename=$(basename $pkg) ;
             if /usr/sbin/pkgutil --check-signature $pkg ; then
-              echo "Warning: $pkg is already signed, skipping" ;
+              echo Warning: $pkg is already signed skipping ;
               cp $pkg #{signed_items_directory}/$pkg_basename ;
               continue ;
             fi ;
@@ -70,7 +70,8 @@ module Pkg::Sign::Dmg
 
       dmgs.each do |dmg|
         Pkg::Util::Net.rsync_from(
-          "#{remote_working_directory}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
+          "#{remote_working_directory}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg)
+        )
       end
 
       Pkg::Util::Net.remote_execute(ssh_host_string, "rm -rf '#{remote_working_directory}'")