iesd 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac5e6422553fbc24733e6b6df384a04f026b7ea
-  data.tar.gz: 9f70b146938796a582bdd5c2d9050f840bd8f6e0
+  metadata.gz: 0d6447d914c3336dfcbd31bed32b08e466afd817
+  data.tar.gz: 1283183f073d822b41df8721be9068f6771645b7
 SHA512:
-  metadata.gz: a0e5bcfae01077ee7927ae424844d65f8c383c2405d0b26e46ce30c9946d73a19e5294e4536e9097fd03f8293e8bea1931c19ebe5b791d4b6fefe6c4911a1bdb
-  data.tar.gz: 04f8923c1e28f416e27e6c16585228230c62f9569eb6f7359065eb59b06bc4661f0e0d5c434d6c72f12581ad7c1581d9db6d06d9955c3c884bccbcad53917144
+  metadata.gz: 3891f8b6de4af530d2708ac096dab375d92cf88070d5fd9f89dced055503d4c15f320b6d7c9257da7f81bbe037080f45f9aa66ad1a2847f2efe4dc16899a5ff8
+  data.tar.gz: f181900399e4ed2f78d99cfd6929709a0c8085589ed12604f1d4e9c6ee01eefb3fd5d8308a78dc30aaacc924aa38c29d858aaf27163acdf6f277c700de941dfd

data/bin/iesd

@@ -27,7 +27,7 @@ options = {
   :mach_kernel => nil,
   :extensions => {
     :install => [],
-    :remove => [],
+    :uninstall=> [],
     :kextcache => nil,
     :postinstall => true
   }
@@ -39,23 +39,23 @@ optparse = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Specific options:"
 
-  opts.on("-i", "--input inputfile",
-          "Input file (dmg or app)") do |input|
+  opts.on("-i", "--input file",
+          "Specify the input dmg or app.") do |input|
     options[:input] = File.absolute_path input
   end
 
-  opts.on("-o", "--output outputfile",
-          "Output file (dmg)") do |output|
+  opts.on("-o", "--output file",
+          "Specify the output dmg.") do |output|
     output << ".dmg" if File.extname(output).downcase != ".dmg"
     options[:output] = File.absolute_path output
   end
 
   opts.on("-t", "--type type", [:BaseSystem, :InstallESD],
-          "Output type (BaseSystem, InstallESD)") do |type|
+          "Specify the output type.  Type could be BaseSystem or InstallESD.") do |type|
     options[:type] = type
   end
 
-  opts.on("-s", "--[no-]interactive-shell", "Edit in #{ENV["SHELL"]}") do |interactive|
+  opts.on("-s", "--[no-]interactive-shell", "Open #{ENV["SHELL"]} inside the temporary mount directory.") do |interactive|
     options[:interactive] = interactive
   end
 
@@ -63,44 +63,46 @@ optparse = OptionParser.new do |opts|
   opts.separator "HDIUtil options:"
 
   opts.on("--grow sectors", OptionParser::DecimalInteger,
-          "Grow dmg size by number of sectors") do |sectors|
+          "Specify the size of the image to grow in 512-byte sectors.") do |sectors|
     options[:hdiutil][:resize][:grow] = sectors
   end
 
-  opts.on("--[no-]shrink", "Shrink output dmg") do |s|
+  opts.on("--[no-]shrink", "Do [not] shrink the output image.") do |s|
     options[:hdiutil][:resize][:shrink] = s
   end
 
   opts.separator ""
   opts.separator "Boot options:"
 
-  opts.on("--[no-]kernel", "Use mach_kernel as fallback to kernelcache") do |k|
+  opts.on("--[no-]fallback-kernel", "Do [not] fallback to mach_kernel when kernelcache fails to boot.") do |k|
     options[:mach_kernel] = k
   end
 
   opts.separator ""
-  opts.separator "Extension options:"
+  opts.separator "Extensions options:"
 
-  opts.on("--remove-kexts x.kext,y.kext,z.kext", Array, "Kexts to remove") do |list|
-    options[:extensions][:remove] = list
+  opts.on("--install-extension kext",
+          "Add the kext to the list of the extensions to be installed.") do |kext|
+    options[:extensions][:install].push File.absolute_path kext
   end
 
-  opts.on("--install-kexts x.kext,y.kext,z.kext", Array, "Kexts to install") do |list|
-    options[:extensions][:install] = list.map { |kext| File.absolute_path kext }
+  opts.on("--uninstall-extension kext",
+          "Add the kext to the list of the extensions to be uninstalled.") do |kext|
+    options[:extensions][:uninstall].push kext
   end
 
-  opts.on("--[no-]postinstall-kexts", "Patch OSInstall.pkg to postinstall kexts") do |p|
+  opts.on("--[no-]postinstall-extensions", "Do [not] patch OSInstall.pkg to postinstall extensions.") do |p|
     options[:extensions][:postinstall] = p
   end
 
-  opts.on("--[no-]kextcache", "Rebuild kernelcache") do |c|
+  opts.on("--[no-]update-kernelcache", "Do [not] rebuild the startup kernelcache.") do |c|
     options[:extensions][:kextcache] = c
   end
 
   opts.separator ""
   opts.separator "Common options:"
 
-  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+  opts.on("--[no-]verbose", "Run verbosely") do |v|
     ENV['VERBOSE'] = '1'
   end
 
@@ -129,7 +131,7 @@ end
 begin
   raise "input file does not exist" unless File.exist? options[:input]
   raise "output file already exists" if File.exist? options[:output]
-  options[:extensions][:remove].select { |kext|
+  options[:extensions][:uninstall].select { |kext|
     if File.extname(kext) == ".kext"
       true
     else

data/iesd.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.2"
 
   s.name                  = "iesd"
-  s.version               = "1.1.2"
+  s.version               = "1.2.0"
   s.summary               = "Customize OS X InstallESD."
   s.description           = "Modify Extensions, Kextcache and Packages on InstallESD."
   s.authors               = "なつき"

data/lib/iesd.rb

@@ -1,7 +1,5 @@
 $:.unshift File.dirname(__FILE__)
 
-require "tmpdir"
-
 require "iesd/utility"
 require "iesd/InstallESD"
 require "iesd/InstallESD/Extensions"

data/lib/iesd/InstallESD/BaseSystem.dmg.rb

@@ -8,7 +8,7 @@ module IESD
         when :BaseSystem, nil
           Dir.mktmpdir { |tmp|
             HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), options[:hdiutil]) { |volume_root|
-              options[:extensions][:up_to_date] = (options[:extensions][:remove].empty? and options[:extensions][:install].empty?)
+              options[:extensions][:up_to_date] = (options[:extensions][:uninstall].empty? and options[:extensions][:install].empty?)
               options[:mach_kernel] = File.exist? File.join(volume_root, "mach_kernel") if options[:mach_kernel].nil?
 
               yield volume_root if block_given?
@@ -25,7 +25,7 @@ module IESD
                 HDIUtil.shell volume_root
               end
             }
-            system(Utility::MV, tmpfile, options[:output])
+            system("/usr/bin/env", "mv", tmpfile, options[:output])
           }
         else
           raise "invalid output type"
@@ -37,7 +37,7 @@ module IESD
       def pre_update_extension volume_root, options
         if !File.exist? (mach_kernel = File.join(volume_root, "mach_kernel")) and (options[:mach_kernel] or !options[:extensions][:up_to_date])
           IESD::Packages::BaseSystemBinaries.new(File.join(volume_root, *PACKAGES, "BaseSystemBinaries.pkg")).extract_mach_kernel mach_kernel
-          system(Utility::CHFLAGS, "hidden", mach_kernel)
+          system("/usr/bin/env", "chflags", "hidden", mach_kernel)
         end
       end
 
@@ -46,13 +46,13 @@ module IESD
           IESD::Packages::OSInstall.new(File.join(volume_root, *PACKAGES, "OSInstall.pkg")).postinstall_extensions options[:extensions]
         end
         if !options[:mach_kernel] and File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
-          system(Utility::RM, mach_kernel)
+          system("/usr/bin/env", "rm", mach_kernel)
         end
       end
 
       class Extensions < IESD::Extensions
         def update extensions
-          remove extensions[:remove]
+          uninstall extensions[:uninstall]
           install extensions[:install]
           KextCache.update_volume @volume_root if extensions[:kextcache] or (extensions[:kextcache].nil? and !extensions[:up_to_date])
         end

data/lib/iesd/InstallESD/Extensions.rb

@@ -1,20 +1,29 @@
 module IESD
   class Extensions
     EXTENSIONS = %w{ System Library Extensions }
+    EXTRA_EXTENSIONS = %w{ Library Extensions }
 
     attr_reader :volume_root, :url
 
     def initialize volume_root
       @volume_root = volume_root
-      @url = File.join @volume_root, *EXTENSIONS
+      @extensions = File.join @volume_root, *EXTENSIONS
+      @extra_extensions = File.join @volume_root, *EXTRA_EXTENSIONS
     end
 
-    def remove kexts
+    def uninstall kexts
       if !kexts.empty?
-        oh1 "Removing Extensions"
+        oh1 "Uninstalling Extensions"
         kexts.each { |kext|
-          system(Utility::RM, "-rf", File.join(@url, kext))
-          puts "Removed: #{File.join(@url, kext)}"
+          kext_url = File.join(@extra_extensions, kext)
+          if File.exist? kext_url
+            system("/usr/bin/env", "rm", "-rf", kext_url)
+            puts "Uninstalled: #{kext_url}"
+          else
+            kext_url = File.join(@extensions, kext)
+            system("/usr/bin/env", "rm", "-rf", kext_url)
+            puts "Removed: #{kext_url}"
+          end
         }
       end
     end
@@ -23,8 +32,15 @@ module IESD
       if !kexts.empty?
         oh1 "Installing Extensions"
         kexts.each { |kext|
-          system(Utility::DITTO, kext, File.join(@url, File.basename(kext)))
-          puts "Installed: #{File.join(@url, File.basename(kext))}"
+          kext_url = File.join(@extensions, File.basename(kext))
+          if File.exist? kext_url
+            system("/usr/bin/env", "ditto", kext, kext_url)
+            puts "Overwrote: #{kext_url}"
+          else
+            kext_url = File.join(@extra_extensions, File.basename(kext)) if File.exist? @extra_extensions
+            system("/usr/bin/env", "ditto", kext, kext_url)
+            puts "Installed: #{kext_url}"
+          end
         }
       end
     end

data/lib/iesd/InstallESD/InstallESD.dmg.rb

@@ -1,3 +1,5 @@
+require "shellwords"
+
 module IESD
   class DMG
     class InstallESD < HDIUtil::DMG
@@ -13,23 +15,23 @@ module IESD
               }
             }
           }.merge(options)
-          options[:hdiutil][:resize][:grow] += ( `#{Utility::HDIUTIL} resize -limits "#{@url}"`.chomp.split.map { |s| s.to_i } ).first
+          options[:hdiutil][:resize][:grow] += ( `/usr/bin/env hdiutil resize -limits #{@url.shellescape}`.chomp.split.map { |s| s.to_i } ).first
 
           show { |installesd|
             IESD::DMG::BaseSystem.new(File.join(installesd, "BaseSystem.dmg")).export(options) { |basesystem|
               installesd_packages = File.join installesd, PACKAGES
               basesystem_packages = File.join basesystem, *IESD::DMG::BaseSystem::PACKAGES
               oh1 "Copying #{installesd_packages}"
-              system(Utility::RM, basesystem_packages)
-              system(Utility::DITTO, installesd_packages, basesystem_packages)
+              system("/usr/bin/env", "rm", basesystem_packages)
+              system("/usr/bin/env", "ditto", installesd_packages, basesystem_packages)
               puts "Copied: #{basesystem_packages}"
 
               installesd_mach_kernel = File.join installesd, "mach_kernel"
               basesystem_mach_kernel = File.join basesystem, "mach_kernel"
               if File.exist? installesd_mach_kernel
                 oh1 "Copying #{installesd_mach_kernel}"
-                system(Utility::DITTO, installesd_mach_kernel, basesystem_mach_kernel)
-                system(Utility::CHFLAGS, "hidden", basesystem_mach_kernel)
+                system("/usr/bin/env", "ditto", installesd_mach_kernel, basesystem_mach_kernel)
+                system("/usr/bin/env", "chflags", "hidden", basesystem_mach_kernel)
                 puts "Copied: #{basesystem_mach_kernel}"
               end
             }
@@ -37,7 +39,7 @@ module IESD
         when :InstallESD, nil
           Dir.mktmpdir { |tmp|
             HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), options[:hdiutil]) { |installesd|
-              options[:extensions][:up_to_date] = (options[:extensions][:remove].empty? and options[:extensions][:install].empty?)
+              options[:extensions][:up_to_date] = (options[:extensions][:uninstall].empty? and options[:extensions][:install].empty?)
               options[:mach_kernel] = File.exist? File.join(installesd, "mach_kernel") if options[:mach_kernel].nil?
 
               yield installesd if block_given?
@@ -46,24 +48,24 @@ module IESD
 
               basesystem_options = options.clone
               basesystem_options[:input] = basesystem_options[:output] = File.join(installesd, "BaseSystem.dmg")
-              basesystem_flags = `#{Utility::LS} -lO "#{basesystem_options[:input]}"`.split[4]
+              basesystem_flags = `/usr/bin/env ls -lO #{basesystem_options[:input].shellescape}`.split[4]
               IESD::DMG::InstallESD::BaseSystem.new(File.join(basesystem_options[:input])).export(basesystem_options) { |basesystem|
                 installesd_mach_kernel = File.join installesd, "mach_kernel"
                 basesystem_mach_kernel = File.join basesystem, "mach_kernel"
                 if File.exist? installesd_mach_kernel
                   oh1 "Copying #{installesd_mach_kernel}"
-                  system(Utility::DITTO, installesd_mach_kernel, basesystem_mach_kernel)
-                  system(Utility::CHFLAGS, "hidden", basesystem_mach_kernel)
+                  system("/usr/bin/env", "ditto", installesd_mach_kernel, basesystem_mach_kernel)
+                  system("/usr/bin/env", "chflags", "hidden", basesystem_mach_kernel)
                   puts "Copied: #{basesystem_mach_kernel}"
                 end
               }
-              system(Utility::CHFLAGS, basesystem_flags, basesystem_options[:output]) unless basesystem_flags == "-"
+              system("/usr/bin/env", "chflags", basesystem_flags, basesystem_options[:output]) unless basesystem_flags == "-"
 
               if File.exist? (kextcache = File.join(installesd, "kernelcache"))
                 IESD::DMG::InstallESD::BaseSystem.new(File.join(basesystem_options[:output])).show { |basesystem|
                   oh1 "Updating Kextcache"
-                  system(Utility::DITTO, File.join(basesystem, *KextCache::KERNELCACHE), kextcache)
-                  system(Utility::CHFLAGS, "hidden", kextcache)
+                  system("/usr/bin/env", "ditto", File.join(basesystem, *KextCache::KERNELCACHE), kextcache)
+                  system("/usr/bin/env", "chflags", "hidden", kextcache)
                   puts "Updated: #{kextcache}"
                 }
               end
@@ -76,7 +78,7 @@ module IESD
                 HDIUtil.shell installesd
               end
             }
-            system(Utility::MV, tmpfile, options[:output])
+            system("/usr/bin/env", "mv", tmpfile, options[:output])
           }
         else
           raise "invalid output type"
@@ -88,7 +90,7 @@ module IESD
       def pre_update_extension volume_root, options
         if !File.exist? (mach_kernel = File.join(volume_root, "mach_kernel")) and (options[:mach_kernel] or !options[:extensions][:up_to_date])
           IESD::Packages::BaseSystemBinaries.new(File.join(volume_root, *PACKAGES, "BaseSystemBinaries.pkg")).extract_mach_kernel mach_kernel
-          system(Utility::CHFLAGS, "hidden", mach_kernel)
+          system("/usr/bin/env", "chflags", "hidden", mach_kernel)
         end
       end
 
@@ -97,7 +99,7 @@ module IESD
           IESD::Packages::OSInstall.new(File.join(volume_root, *PACKAGES, "OSInstall.pkg")).postinstall_extensions options[:extensions]
         end
         if !options[:mach_kernel] and File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
-          system(Utility::RM, mach_kernel)
+          system("/usr/bin/env", "rm", mach_kernel)
         end
       end
 
@@ -110,7 +112,7 @@ module IESD
 
         def post_update_extension volume_root, options
           if File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
-            system(Utility::RM, mach_kernel)
+            system("/usr/bin/env", "rm", mach_kernel)
           end
         end
       end

data/lib/iesd/InstallESD/Packages/BaseSystemBinaries.pkg.rb

@@ -1,3 +1,5 @@
+require "shellwords"
+
 module IESD
   class Packages
     class BaseSystemBinaries < PKGUtil::PKG
@@ -6,18 +8,18 @@ module IESD
           payload = "#{pkg}/Payload"
           cpio = "#{payload}.cpio"
           ohai "Unarchiving #{payload}"
-          case `#{Utility::FILE} --brief --mime-type #{payload}`.chomp
+          case `/usr/bin/env file --brief --mime-type #{payload.shellescape}`.chomp
           when "application/x-bzip2"
-            system(Utility::MV, payload, "#{cpio}.bz2")
-            system(Utility::BUNZIP2, "#{cpio}.bz2")
+            system("/usr/bin/env", "mv", payload, "#{cpio}.bz2")
+            system("/usr/bin/env", "bunzip2", "#{cpio}.bz2")
           when "application/x-gzip"
-            system(Utility::MV, payload, "#{cpio}.gz")
-            system(Utility::GUNZIP, "#{cpio}.gz")
+            system("/usr/bin/env", "mv", payload, "#{cpio}.gz")
+            system("/usr/bin/env", "gunzip", "#{cpio}.gz")
           end
           puts "Unarchived: #{cpio}"
           ohai "Extracting /mach_kernel"
-          system("#{Utility::CPIO} -p -d -I \"#{cpio}\" -- \"#{payload}\" <<</mach_kernel >/dev/null 2>&1")
-          system(Utility::MV, "#{payload}/mach_kernel", output)
+          system("/usr/bin/env cpio -p -d -I #{cpio.shellescape} -- #{payload.shellescape} <<</mach_kernel >/dev/null 2>&1")
+          system("/usr/bin/env", "mv", "#{payload}/mach_kernel", output)
           puts "Extracted: #{output}"
         }
       end

data/lib/iesd/InstallESD/Packages/OSInstall.pkg.rb

@@ -7,13 +7,19 @@ module IESD
           script = File.join pkg, *%w{ Scripts postinstall_actions kext.tool }
           File.open(script, "a+") { |f|
             f.puts("#!/bin/sh")
-            extensions[:remove].each { |kext|
-              f.puts("logger -p install.info \"Removing #{kext}\"")
-              f.puts("/bin/rm -rf \"$3/System/Library/Extensions/#{kext}\"")
+            extensions[:uninstall].each { |kext|
+              f.puts(%Q{logger -p install.info "Uninstalling #{kext}"})
+              f.puts(%Q{/bin/test -e "$3%{extra_extensions_kext}" && /bin/rm -rf "$3%{extra_extensions_kext}" || /bin/rm -rf "$3%{extensions_kext}"} % {
+                :extensions_kext => "/System/Library/Extensions/#{kext}",
+                :extra_extensions_kext => "/Library/Extensions/#{kext}"
+              })
             }
             extensions[:install].each { |kext|
-              f.puts("logger -p install.info \"Installing #{File.basename kext}\"")
-              f.puts("/usr/bin/ditto \"/System/Library/Extensions/#{File.basename kext}\" \"$3/System/Library/Extensions/#{File.basename kext}\"")
+              f.puts(%Q{logger -p install.info "Installing #{File.basename kext}"})
+              f.puts(%Q{/bin/test -e "%{extensions_kext}" && /usr/bin/ditto "%{extensions_kext}" "$3%{extensions_kext}" || /usr/bin/ditto "%{extra_extensions_kext}" "$3%{extra_extensions_kext}"} % {
+                :extensions_kext => "/System/Library/Extensions/#{File.basename kext}",
+                :extra_extensions_kext => "/Library/Extensions/#{File.basename kext}"
+              })
             }
           }
           File.chmod(0755, script)

data/lib/iesd/utility.rb

@@ -1,18 +1 @@
-require "tmpdir"
-
-module Utility
-  BUNZIP2 = "/usr/bin/bunzip2"
-  CHFLAGS = "/usr/bin/chflags"
-  CPIO = "/usr/bin/cpio"
-  DITTO = "/usr/bin/ditto"
-  FILE = "/usr/bin/file"
-  GUNZIP = "/usr/bin/gunzip"
-  HDIUTIL = "/usr/bin/hdiutil"
-  KEXTCACHE = "/usr/sbin/kextcache"
-  LS = "/bin/ls"
-  MV = "/bin/mv"
-  PKGUTIL = "/usr/sbin/pkgutil"
-  RM = "/bin/rm"
-end
-
 Dir[File.join(File.dirname(__FILE__), "utility", "*.rb")].each { |rb| require rb }

data/lib/iesd/utility/hdiutil.rb

@@ -1,3 +1,7 @@
+require "shellwords"
+require "tmpdir"
+require_relative "tty"
+
 module HDIUtil
   DEFAULT_MOUNT_OPTIONS = %w{ -nobrowse -quiet -noverify }
   DEFAULT_MOUNT_OPTIONS.concat(%w{ -owners on }) if Process.uid == 0
@@ -27,11 +31,11 @@ module HDIUtil
     Dir.mktmpdir { |tmp|
       shadow = File.join(tmp, "#{File.basename input}.shadow")
       shadow_options = ["-shadow", shadow]
-      format_options = ["-format", `#{Utility::HDIUTIL} imageinfo -format "#{input}"`.chomp]
+      format_options = ["-format", `/usr/bin/env hdiutil imageinfo -format #{input.shellescape}`.chomp]
       Dir.mktmpdir(nil, tmp) { |mountpoint|
-        resize_limits = `#{Utility::HDIUTIL} resize -limits -shadow "#{shadow}" "#{input}"`.chomp.split.map { |s| s.to_i }
+        resize_limits = `/usr/bin/env hdiutil resize -limits -shadow #{shadow.shellescape} #{input.shellescape}`.chomp.split.map { |s| s.to_i }
         sectors = (resize_limits[1] + options[:resize][:grow]).to_s
-        system(Utility::HDIUTIL, "resize", "-growonly", "-sectors", sectors, *shadow_options, input)
+        system("/usr/bin/env", "hdiutil", "resize", "-growonly", "-sectors", sectors, *shadow_options, input)
         attach input, mountpoint, [*DEFAULT_MOUNT_OPTIONS, *shadow_options]
         if block_given?
           yield mountpoint
@@ -39,29 +43,29 @@ module HDIUtil
           shell mountpoint
         end
         detach input, mountpoint, [*DEFAULT_UNMOUNT_OPTIONS]
-        system(Utility::HDIUTIL, "resize", "-shrinkonly", "-sectors", "min", *shadow_options, input) if options[:resize][:shrink]
+        system("/usr/bin/env", "hdiutil", "resize", "-shrinkonly", "-sectors", "min", *shadow_options, input) if options[:resize][:shrink]
       }
       oh1 "Merging #{shadow}"
-      system(Utility::HDIUTIL, "convert", *DEFAULT_CONVERT_OPTIONS, *format_options, *shadow_options, "-o", output, input)
+      system("/usr/bin/env", "hdiutil", "convert", *DEFAULT_CONVERT_OPTIONS, *format_options, *shadow_options, "-o", output, input)
       puts "Merged: #{output}"
     }
   end
 
   def self.validate input
-    Kernel.system("#{Utility::HDIUTIL} imageinfo \"#{input}\" >/dev/null 2>&1")
+    Kernel.system(%Q{/usr/bin/env hdiutil imageinfo #{input.shellescape} >/dev/null 2>&1})
   end
 
   private
 
   def self.attach dmg, mountpoint, arguments = []
     ohai "Mounting #{dmg}"
-    system(Utility::HDIUTIL, "attach", *arguments, "-mountpoint", mountpoint, dmg)
+    system("/usr/bin/env", "hdiutil", "attach", *arguments, "-mountpoint", mountpoint, dmg)
     puts "Mounted: #{mountpoint}"
   end
 
   def self.detach dmg, mountpoint, arguments = []
     ohai "Unmounting #{dmg}"
-    system(Utility::HDIUTIL, "detach", *arguments, mountpoint)
+    system("/usr/bin/env", "hdiutil", "detach", *arguments, mountpoint)
     puts "Unmounted: #{mountpoint}"
   end
 
@@ -91,10 +95,10 @@ module HDIUtil
 
     def update &block
       Dir.mktmpdir { |tmp|
-        flags = `#{Utility::LS} -lO "#{@url}"`.split[4]
+        flags = `/usr/bin/env ls -lO #{@url.shellescape}`.split[4]
         HDIUtil.write(@url, (tmpfile = File.join(tmp, File.basename(@url))), &block)
-        system(Utility::MV, tmpfile, @url)
-        system(Utility::CHFLAGS, flags, @url) unless flags == "-"
+        system("/usr/bin/env", "mv", tmpfile, @url)
+        system("/usr/bin/env", "chflags", flags, @url) unless flags == "-"
       }
     end
 

data/lib/iesd/utility/kextcache.rb

@@ -1,7 +1,10 @@
+require_relative "tty"
+
 module KextCache
   KEXTCACHE_DEFAULT_OPTIONS = %w{ -v 0 -no-authentication }
 
   EXTENSIONS = %w{ System Library Extensions }
+  EXTRA_EXTENSIONS = %w{ Library Extensions }
   KERNELCACHE = %w{ System Library Caches com.apple.kext.caches Startup kernelcache }
   MKEXT = %w{ System Library Caches com.apple.kext.caches Startup Extensions.mkext }
   MKEXT_PPC = %w{ System Library Extensions.mkext }
@@ -9,16 +12,18 @@ module KextCache
   def self.update_volume volume_root
     oh1 "Updating Kextcache"
     if File.exist? (mach_kernel = File.join(volume_root, "mach_kernel"))
+      extensions_path = [File.join(volume_root, *EXTENSIONS)]
+      extensions_path.push(File.join(volume_root, *EXTRA_EXTENSIONS)) if File.exist? File.join(volume_root, *EXTRA_EXTENSIONS)
       case
       when (File.exist? (url = File.join(volume_root, *KERNELCACHE)))
-        system(Utility::KEXTCACHE, *KEXTCACHE_DEFAULT_OPTIONS, "-prelinked-kernel", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", File.join(volume_root, *EXTENSIONS))
+        system("/usr/bin/env", "kextcache", *KEXTCACHE_DEFAULT_OPTIONS, "-prelinked-kernel", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
       when (File.exist? (url = File.join(volume_root, *MKEXT)))
-        system(Utility::KEXTCACHE, *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a i386 -a x86_64 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", File.join(volume_root, *EXTENSIONS))
+        system("/usr/bin/env", "kextcache", *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a i386 -a x86_64 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
         if File.exist? (mkext_ppc = File.join(volume_root, *MKEXT_PPC))
-          system(Utility::DITTO, url, mkext_ppc)
+          system("/usr/bin/env", "ditto", url, mkext_ppc)
         end
       when (File.exist? (url = File.join(volume_root, *MKEXT_PPC)))
-        system(Utility::DITTO, *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a ppc -a i386 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", File.join(volume_root, *EXTENSIONS))
+        system("/usr/bin/env", "ditto", *KEXTCACHE_DEFAULT_OPTIONS, *%w{ -a ppc -a i386 }, "-mkext", url, "-kernel", mach_kernel, "-volume-root", volume_root, "--", *extensions_path)
       else
         puts "kextcache aborted: unknown kernel cache type"
         return

data/lib/iesd/utility/pkgutil.rb

@@ -1,3 +1,6 @@
+require "tmpdir"
+require_relative "tty"
+
 module PKGUtil
   def self.read input
     Dir.mktmpdir { |tmp|
@@ -28,13 +31,13 @@ module PKGUtil
 
   def self.expand pkg, dir
     ohai "Expanding #{pkg}"
-    system(Utility::PKGUTIL, "--expand", pkg, dir)
+    system("/usr/bin/env", "pkgutil", "--expand", pkg, dir)
     puts "Expanded: #{dir}"
   end
 
   def self.flatten dir, pkg
     ohai "Flattening #{dir}"
-    system(Utility::PKGUTIL, "--flatten", dir, pkg)
+    system("/usr/bin/env", "pkgutil", "--flatten", dir, pkg)
     puts "Flattened: #{pkg}"
   end
 

data/lib/iesd/utility/tty.rb

@@ -1,3 +1,5 @@
+require "shellwords"
+
 module Tty extend self
   def blue; bold 34; end
   def white; bold 39; end
@@ -32,14 +34,6 @@ module Tty extend self
   end
 end
 
-class Array
-  def shell_s
-    cp = dup
-    first = cp.shift
-    cp.map{ |arg| arg.gsub " ", "\\ " }.unshift(first) * " "
-  end
-end
-
 def ohai title, *sput
   title = Tty.truncate(title) if $stdout.tty? && ENV['VERBOSE'].nil?
   puts "#{Tty.blue}==>#{Tty.white} #{title}#{Tty.reset}"
@@ -67,7 +61,7 @@ def odie error
 end
 
 def system *args
-  abort "Failed during: #{args.shell_s}" unless Kernel.system *args
+  abort "Failed during: #{args.shelljoin}" unless Kernel.system *args
 end
 
 def sudo *args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iesd
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - "なつき"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies: []
 description: Modify Extensions, Kextcache and Packages on InstallESD.
 email: i@ntk.me