Merge pull request #86 from boxen/default-paths

Use default Homebrew paths unless Boxen's exists.
boxen · Aug 18, 2015 · 4de455d · 4de455d
2 parents 3537c38 + d49adf3
commit 4de455d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/facter/homebrew_root.rb b/lib/facter/homebrew_root.rb
@@ -4,5 +4,11 @@
   # Explicit, low weight makes this easily overridable
   has_weight 1
 
-  setcode { "#{Facter.value(:boxen_home)}/homebrew" }
+  setcode do
+    if File.exist? "#{Facter.value(:boxen_home)}/homebrew/bin/brew"
+      "#{Facter.value(:boxen_home)}/homebrew"
+    else
+      "/usr/local"
+    end
+  end
 end
diff --git a/lib/puppet/provider/package/homebrew.rb b/lib/puppet/provider/package/homebrew.rb
@@ -18,7 +18,8 @@ def self.home
   end
 
   def self.cache
-    if boxen_home = Facter.value(:boxen_home)
+    boxen_home = Facter.value(:boxen_home)
+    if boxen_home && File.exist?("#{boxen_home}/cache/homebrew")
       "#{boxen_home}/cache/homebrew"
     else
       ENV["HOMEBREW_CACHE"] || "/Library/Caches/Homebrew"