Merge pull request #14369 from Kentzo/fix-cask-redundant-mkdir
cask: don't attempt to make a directory that already exists.
This commit is contained in:
commit
14fe3ccf3a
@ -70,10 +70,13 @@ module Cask
|
|||||||
end
|
end
|
||||||
|
|
||||||
ohai "Moving #{self.class.english_name} '#{source.basename}' to '#{target}'"
|
ohai "Moving #{self.class.english_name} '#{source.basename}' to '#{target}'"
|
||||||
if target.dirname.ascend.find(&:directory?).writable?
|
|
||||||
target.dirname.mkpath
|
unless target.dirname.exist?
|
||||||
else
|
if target.dirname.ascend.find(&:directory?).writable?
|
||||||
command.run!("/bin/mkdir", args: ["-p", target.dirname], sudo: true)
|
target.dirname.mkpath
|
||||||
|
else
|
||||||
|
command.run!("/bin/mkdir", args: ["-p", target.dirname], sudo: true)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if target.dirname.writable?
|
if target.dirname.writable?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user