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

Merge pull request #1252 from niw/fix_cask_command_changes_entire_directory_ownership

Browse Source 
FIX: cask changes /usr/local ownership recursively
This commit is contained in:
Josh Hagins 2016-10-24 01:21:08 -04:00 committed by GitHub
commit b481ed73a0
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/Homebrew/cask/lib/hbc/caskroom.rb
View File

@ -13,7 +13,7 @@ module Hbc
FileUtils.mv repo_caskroom, Hbc.caskroom FileUtils.mv repo_caskroom, Hbc.caskroom
else else
opoo "#{Hbc.caskroom.parent} is not writable, sudo is needed to move the Caskroom." opoo "#{Hbc.caskroom.parent} is not writable, sudo is needed to move the Caskroom."
system "/usr/bin/sudo", "--", "/bin/mv", "--", repo_caskroom.to_s, Hbc.caskroom.parent.to_s SystemCommand.run("/bin/mv", args: [repo_caskroom, Hbc.caskroom.parent], sudo: true)
end end
end end
@ -21,24 +21,13 @@ module Hbc
return if Hbc.caskroom.exist? return if Hbc.caskroom.exist?
ohai "Creating Caskroom at #{Hbc.caskroom}" ohai "Creating Caskroom at #{Hbc.caskroom}"
if Hbc.caskroom.parent.writable? ohai "We'll set permissions properly so we won't need sudo in the future"
Hbc.caskroom.mkpath sudo = !Hbc.caskroom.parent.writable?
else
ohai "We'll set permissions properly so we won't need sudo in the future" SystemCommand.run("/bin/mkdir", args: ["-p", Hbc.caskroom], sudo: sudo)
toplevel_dir = Hbc.caskroom SystemCommand.run("/bin/chmod", args: ["g+rwx", Hbc.caskroom], sudo: sudo)
toplevel_dir = toplevel_dir.parent until toplevel_dir.parent.root? SystemCommand.run("/usr/sbin/chown", args: [Utils.current_user, Hbc.caskroom], sudo: sudo)
unless toplevel_dir.directory? SystemCommand.run("/usr/bin/chgrp", args: ["admin", Hbc.caskroom], sudo: sudo)
# If a toplevel dir such as '/opt' must be created, enforce standard permissions.
# sudo in system is rude.
system "/usr/bin/sudo", "--", "/bin/mkdir", "--", toplevel_dir
system "/usr/bin/sudo", "--", "/bin/chmod", "--", "0775", toplevel_dir
end
# sudo in system is rude.
system "/usr/bin/sudo", "--", "/bin/mkdir", "-p", "--", Hbc.caskroom
unless Hbc.caskroom.parent == toplevel_dir
system "/usr/bin/sudo", "--", "/usr/sbin/chown", "-R", "--", "#{Utils.current_user}:staff", Hbc.caskroom.parent.to_s
end
end
end end
end end
end end