lib/omnibus/packagers/solaris.rb in omnibus-4.1.0 vs lib/omnibus/packagers/solaris.rb in omnibus-5.0.0

@@ -12,33 +12,36 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 
+require 'socket'
+
 module Omnibus
   class Packager::Solaris < Packager::Base
+    # @return [Hash]
+    SCRIPT_MAP = {
+      # Default Omnibus naming
+      postinst:  'postinstall',
+      postrm: 'postremove',
+      # Default Solaris naming
+      postinstall:  'postinstall',
+      postremove: 'postremove',
+    }.freeze
+
     id :solaris
 
     build do
-      shellout! "cd #{install_dirname} && find #{install_basename} -print > #{staging_dir_path('files')}"
-      
-
-      write_prototype_content
-
-      write_pkginfo_content
-
-      copy_file("#{project.package_scripts_path}/postinst", staging_dir_path('postinstall'))
-      copy_file("#{project.package_scripts_path}/postrm", staging_dir_path('postremove'))
-
-      shellout! "pkgmk -o -r #{install_dirname} -d #{staging_dir} -f #{staging_dir_path('Prototype')}"
-      shellout! "pkgchk -vd #{staging_dir} #{project.package_name}"
-      shellout! "pkgtrans #{staging_dir} #{package_path} #{project.package_name}"
+      write_scripts
+      write_prototype_file
+      write_pkginfo_file
+      create_solaris_file
     end
 
     # @see Base#package_name
     def package_name
-      "#{project.package_name}-#{pkgmk_version}.#{Ohai['kernel']['machine']}.solaris"
+      "#{project.package_name}-#{pkgmk_version}.#{safe_architecture}.solaris"
     end
 
     def pkgmk_version
       "#{project.build_version}-#{project.build_iteration}"
     end
@@ -48,28 +51,46 @@
     end
 
     def install_basename
       File.basename(project.install_dir)
     end
-    
+
     def staging_dir_path(file_name)
       File.join(staging_dir, file_name)
     end
 
     #
+    # Copy all scripts in {Project#package_scripts_path} to the control
+    # directory of this repo.
+    #
+    # @return [void]
+    #
+    def write_scripts
+      SCRIPT_MAP.each do |source, destination|
+        source_path = File.join(project.package_scripts_path, source.to_s)
+
+        if File.file?(source_path)
+          destination_path = staging_dir_path(destination)
+          log.debug(log_key) { "Adding script `#{source}' to `#{destination_path}'" }
+          copy_file(source_path, destination_path)
+        end
+      end
+    end
+
+    #
     # Generate a Prototype file for solaris build
     #
-    def write_prototype_content
-      prototype_content = <<-EOF.gsub(/^ {8}/, '')
-        i pkginfo
-        i postinstall
-        i postremove
-      EOF
+    def write_prototype_file
+      shellout! "cd #{install_dirname} && find #{install_basename} -print > #{staging_dir_path('files')}"
 
       # generate list of control files
       File.open staging_dir_path('Prototype'), 'w+' do |f|
-        f.write prototype_content
+        f.write <<-EOF.gsub(/^ {10}/, '')
+          i pkginfo
+          i postinstall
+          i postremove
+        EOF
       end
 
       # generate the prototype's file list
       shellout! "cd #{install_dirname} && pkgproto < #{staging_dir_path('files')} > #{staging_dir_path('Prototype.files')}"
 
@@ -78,27 +99,57 @@
     end
 
     #
     # Generate a pkginfo file for solaris build
     #
-    def write_pkginfo_content
+    def write_pkginfo_file
+      hostname = Socket.gethostname
+
+      # http://docs.oracle.com/cd/E19683-01/816-0219/6m6njqbat/index.html
       pkginfo_content = <<-EOF.gsub(/^ {8}/, '')
         CLASSES=none
         TZ=PST
         PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
         BASEDIR=#{install_dirname}
         PKG=#{project.package_name}
         NAME=#{project.package_name}
-        ARCH=#{`uname -p`.chomp}
+        ARCH=#{safe_architecture}
         VERSION=#{pkgmk_version}
         CATEGORY=application
         DESC=#{project.description}
         VENDOR=#{project.maintainer}
         EMAIL=#{project.maintainer}
-        PSTAMP=#{`hostname`.chomp + Time.now.utc.iso8601}
+        PSTAMP=#{hostname}#{Time.now.utc.iso8601}
       EOF
       File.open staging_dir_path('pkginfo'), 'w+' do |f|
         f.write pkginfo_content
+      end
+    end
+
+    #
+    # Generate the Solaris file using +pkg*+.
+    #
+    # @return [void]
+    #
+    def create_solaris_file
+      shellout! "pkgmk -o -r #{install_dirname} -d #{staging_dir} -f #{staging_dir_path('Prototype')}"
+      shellout! "pkgchk -vd #{staging_dir} #{project.package_name}"
+      shellout! "pkgtrans #{staging_dir} #{package_path} #{project.package_name}"
+    end
+
+    #
+    # The architecture for this Solaris package.
+    #
+    # @return [String]
+    #
+    def safe_architecture
+      # The #i386? and #intel? helpers come from chef-sugar
+      if intel?
+        'i386'
+      elsif sparc?
+        'sparc'
+      else
+        Ohai['kernel']['machine']
       end
     end
   end
 end