admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #14368 from Kentzo/fix-cask-backup

Browse Source 
cask: fix writability check backing up an artifact
This commit is contained in:
Mike McQuaid 2023-01-19 09:58:03 +00:00 committed by GitHub
commit 344d32bf7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/artifact/moved.rb
View File

@ -117,7 +117,7 @@ module Cask
source.dirname.mkpath
# We need to preserve extended attributes between copies.
command.run!("/bin/cp", args: ["-pR", target, source], sudo: !target.parent.writable?)
command.run!("/bin/cp", args: ["-pR", target, source], sudo: !source.parent.writable?)
delete(target, force: force, command: command, **options)
end

15
Library/Homebrew/test/cask/artifact/app_spec.rb
View File

@ -263,6 +263,11 @@ describe Cask::Artifact::App, :cask do
end
describe "uninstall_phase" do
after do
FileUtils.chmod 0755, target_path if target_path.exist?
FileUtils.chmod 0755, source_path if source_path.exist?
end
it "deletes managed apps" do
install_phase
@ -272,6 +277,16 @@ describe Cask::Artifact::App, :cask do
expect(target_path).not_to exist
end
it "backs up read-only managed apps" do
install_phase
FileUtils.chmod 0544, target_path
expect { uninstall_phase }.to raise_error(Errno::ENOTEMPTY)
expect(source_path).to be_a_directory
end
end
describe "summary" do