Yosemite support

ntkme · Oct 20, 2014 · be53934 · be53934
1 parent 61d06ae
commit be53934
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/iesd.gemspec b/iesd.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.2"
 
   s.name                  = "iesd"
-  s.version               = "1.2.1"
+  s.version               = "1.2.2"
   s.summary               = "Customize OS X InstallESD."
   s.description           = "Modify Extensions, Kextcache and Packages on InstallESD."
   s.authors               = "なつき"

diff --git a/lib/iesd/InstallESD.rb b/lib/iesd/InstallESD.rb
@@ -33,10 +33,10 @@ def self.new url
           case
           when (File.exist? File.join(mountpoint, *%w[ .IABootFiles ]))
             i = IESD::DMG::InstallOSX.new url
-          when (File.exist? File.join(mountpoint, *%w[ BaseSystem.dmg ]))
-            i = IESD::DMG::InstallESD.new url
           when (File.exist? File.join(mountpoint, *%w[ System Installation ]))
             i = IESD::DMG::BaseSystem.new url
+          when (File.exist? File.join(mountpoint, *%w[ BaseSystem.dmg ]))
+            i = IESD::DMG::InstallESD.new url
           else
             raise "unknown type"
           end

diff --git a/lib/iesd/InstallESD/InstallESD.dmg.rb b/lib/iesd/InstallESD/InstallESD.dmg.rb
@@ -29,6 +29,18 @@ def export options
 
           show { |installesd|
             IESD::DMG::BaseSystem.new(File.join(installesd, "BaseSystem.dmg")).export(options) { |basesystem|
+              installesd_basesystem_dmg = File.join installesd, "BaseSystem.dmg"
+              basesystem_basesystem_dmg = File.join basesystem, "BaseSystem.dmg"
+              oh1 "Copying #{installesd_basesystem_dmg}"
+              system("/usr/bin/env", "ditto", installesd_basesystem_dmg, basesystem_basesystem_dmg)
+              puts "Copied: #{basesystem_basesystem_dmg}"
+
+              installesd_basesystem_chunklist = File.join installesd, "BaseSystem.chunklist"
+              basesystem_basesystem_chunklist = File.join basesystem, "BaseSystem.chunklist"
+              oh1 "Copying #{installesd_basesystem_chunklist}"
+              system("/usr/bin/env", "ditto", installesd_basesystem_chunklist, basesystem_basesystem_chunklist)
+              puts "Copied: #{basesystem_basesystem_chunklist}"
+
               installesd_packages = File.join installesd, PACKAGES
               basesystem_packages = File.join basesystem, IESD::DMG::BaseSystem::PACKAGES
               oh1 "Copying #{installesd_packages}"