Skip to content

Commit

Permalink
unpack_strategy/directory: use FileUtils.mv
Browse files Browse the repository at this point in the history
This should allow automatically deal with file systems though it may not
allow for GNU `cp -a` preservation of hardlinks.
  • Loading branch information
cho-m committed Oct 5, 2024
1 parent 3c51d0c commit eba7468
Showing 1 changed file with 15 additions and 23 deletions.
38 changes: 15 additions & 23 deletions Library/Homebrew/unpack_strategy/directory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,21 @@ def self.can_extract?(path)

sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).void }
def extract_to_dir(unpack_dir, basename:, verbose:)
path_children = path.children
return if path_children.empty?

existing = unpack_dir.children

# We run a few cp attempts in the following order:
#
# 1. Start with `-al` to create hardlinks rather than copying files if the source and
# target are on the same filesystem. On macOS, this is the only cp option that can
# preserve hardlinks but it is only available since macOS 12.3 (file_cmds-353.100.22).
# 2. Try `-a` as GNU `cp -a` preserves hardlinks. macOS `cp -a` is identical to `cp -pR`.
# 3. Fall back on `-pR` to handle the case where GNU `cp -a` failed. This may happen if
# installing into a filesystem that doesn't support hardlinks like an exFAT USB drive.
cp_arg_attempts = ["-a", "-pR"]
cp_arg_attempts.unshift("-al") if path.stat.dev == unpack_dir.stat.dev

cp_arg_attempts.each do |arg|
args = [arg, *path_children, unpack_dir]
must_succeed = print_stderr = (arg == cp_arg_attempts.last)
result = system_command("cp", args:, verbose:, must_succeed:, print_stderr:)
break if result.success?

FileUtils.rm_r(unpack_dir.children - existing)
path.find do |src|
next if src == path

dst = unpack_dir/src.relative_path_from(path)
gid = dst.parent.lstat.gid

if dst.directory? && !dst.symlink?
FileUtils.chmod(src.lstat.mode, dst)
FileUtils.chown(nil, gid, dst) if gid != dst.lstat.gid
FileUtils.touch(dst, mtime: src.mtime, nocreate: true)
else
FileUtils.mv(src, dst)
FileUtils.chown_R(nil, gid, dst)
Find.prune
end
end
end
end
Expand Down

0 comments on commit eba7468

Please sign in to comment.