Skip to content

Fix wildcard copy in cask updates. #15407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reitermarkus merged 11 commits into from
May 12, 2023
Merged

Fix wildcard copy in cask updates. #15407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2e8232d
Replace wildcard copy with a loop over children.
JBYoshi May 11, 2023
a1780c8
Improve unit test to make sure the sudo version is used.
JBYoshi May 11, 2023
d0e64e2
Use / for path concatenation.
JBYoshi May 11, 2023
29c9921
Also use / above.
JBYoshi May 11, 2023
84ad387
Clean up code for feedback.
JBYoshi May 11, 2023
7a108d3
Merge and_call_original instruction into expect() calls.
JBYoshi May 11, 2023
5e23a05
Switch base case expect() to allow().
JBYoshi May 11, 2023
d697037
Merge remote-tracking branch 'origin/master' into cask-upgrade/wildcards
JBYoshi May 11, 2023
0ddeba6
Merge remote-tracking branch 'origin/master' into cask-upgrade/wildcards
JBYoshi May 12, 2023
4a3b892
More test cleanup.
JBYoshi May 12, 2023
b1c7f12
Clean up allow and expect.
JBYoshi May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Library/Homebrew/cask/artifact/moved.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ def move(adopt: false, force: false, verbose: false, predecessor: nil, reinstall

if target.directory?
if target.writable?
source.children.each { |child| FileUtils.move(child, target + child.basename) }
source.children.each { |child| FileUtils.move(child, target/child.basename) }
else
command.run!("/bin/cp", args: ["-pR", "#{source}/*", "#{source}/.*", "#{target}/"],
command.run!("/bin/cp", args: ["-pR", *source.children, target],
sudo: true)
end
Quarantine.copy_xattrs(source, target)
Expand Down
26 changes: 25 additions & 1 deletion Library/Homebrew/test/cask/artifact/app_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe Cask::Artifact::App, :cask do
let(:cask) { Cask::CaskLoader.load(cask_path("local-caffeine")) }
let(:command) { SystemCommand }
let(:command) { NeverSudoSystemCommand }
let(:adopt) { false }
let(:force) { false }
let(:app) { cask.artifacts.find { |a| a.is_a?(described_class) } }
Expand Down Expand Up @@ -334,5 +334,29 @@

expect(contents_path).to exist
end

it "properly handles non-writable directories" do
install_phase

source_contents_path = source_path.join("Contents")
target_contents_path = target_path.join("Contents")

allow(app.target).to receive(:writable?).and_return false
allow(command).to receive(:run!).with(any_args).and_call_original

expect(command).to receive(:run!)
.with("/bin/cp", args: ["-pR", source_contents_path, target_path],
sudo: true)
.and_call_original
expect(FileUtils).not_to receive(:move).with(source_contents_path, an_instance_of(Pathname))

app.uninstall_phase(command: command, force: force, successor: cask)
expect(target_contents_path).not_to exist
expect(target_path).to exist
expect(source_contents_path).to exist

app.install_phase(command: command, adopt: adopt, force: force, predecessor: cask)
expect(target_contents_path).to exist
end
end
end