Merge pull request #4978 from rolandwalker/eject_error_code

don't check error code of diskutil eject
2026-08-05 13:43:24 -07:00 · 2014-06-19 12:04:46 -04:00
parent ab0638701b 06c9bae613
commit e6cca46301
1 changed files with 12 additions and 1 deletions
@@ -45,7 +45,18 @@ class Cask::Container::Dmg < Cask::Container::Base
  def eject!
    @mounts.each do |mount|
      # realpath is a failsafe against unusual filenames
-      @command.run!('/usr/sbin/diskutil', :args => ['eject', Pathname.new(mount).realpath])
+      mountpath = Pathname.new(mount).realpath
+      next unless mountpath.exist?
+      @command.run('/usr/sbin/diskutil',
+                     :args => ['eject', mountpath],
+                     :stderr => :silence)
+      next unless mountpath.exist?
+      sleep 1
+      @command.run('/usr/sbin/diskutil',
+                     :args => ['eject', mountpath],
+                     :stderr => :silence)
+      next unless mountpath.exist?
+      raise CaskError.new "Failed to eject #{mountpath}"
    end
  end
 end