aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2013-07-02 08:19:29 -0700
committerAdam Vandenberg2013-07-02 08:59:33 -0700
commit4441fba849f91b26c5609949db8e2b762f7296d1 (patch)
treef5ddbff66fa25229f3ab08341dfc276a17cd18fd /Library
parent09d575d96f4d07f32caadd317423147fbd18d167 (diff)
downloadhomebrew-4441fba849f91b26c5609949db8e2b762f7296d1.tar.bz2
Better handling of Gnome desktop files
Gnome desktop support has a lot of folders in share that should be created directly in share, rather than shared. Add these folders to keg, and don't link any icon cache files into share. Closes #20340.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/keg.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 04d1be8e1..a17972d76 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -108,6 +108,8 @@ class Keg < Pathname
share_mkpaths = %w[aclocal doc info locale man]
share_mkpaths.concat((1..8).map { |i| "man/man#{i}" })
share_mkpaths.concat((1..8).map { |i| "man/cat#{i}" })
+ # Paths used by Gnome Desktop support
+ share_mkpaths.concat %w[applications icons pixmaps sounds]
# yeah indeed, you have to force anything you need in the main tree into
# these dirs REMEMBER that *NOT* everything needs to be in the main tree
@@ -122,6 +124,9 @@ class Keg < Pathname
when INFOFILE_RX then ENV['HOMEBREW_KEEP_INFO'] ? :info : :skip_file
when LOCALEDIR_RX then :mkpath
when *share_mkpaths then :mkpath
+ when /^icons\/.*\/icon-theme\.cache$/ then :skip_file
+ # all icons subfolders should also mkpath
+ when /^icons\// then :mkpath
when /^zsh/ then :mkpath
else :link
end