Merge pull request #81 from boxen/binary-tweaks

Binary tweaks
boxen · Mar 12, 2015 · f50895f · f50895f
2 parents bf5a4f6 + d4d63bb
commit f50895f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/files/boxen-bottle-hooks.rb b/files/boxen-bottle-hooks.rb
@@ -13,17 +13,27 @@ def self.file(formula)
     "#{formula.name}-#{formula.pkg_version}.tar.bz2"
   end
 
+  # Keep in sync with same-named function in:
+  # https://github.com/boxen/our-boxen/blob/master/script/sync
+  def self.s3_cellar
+    case HOMEBREW_CELLAR.to_s
+    when "/opt/boxen/homebrew/Cellar" then ""
+    when "/usr/local/Cellar" then "default/"
+    else "#{Base64.strict_encode64(HOMEBREW_CELLAR.to_s)}/"
+    end
+  end
+
   def self.url(formula)
     os     = MacOS.version
     file   = self.file(formula)
-    path = "/#{Base64.strict_encode64(HOMEBREW_CELLAR)}/#{os}/#{file}"
+    path = "/#{s3_cellar}#{os}/#{file}"
 
     if ENV['BOXEN_HOMEBREW_BOTTLE_URL']
       ENV['BOXEN_HOMEBREW_BOTTLE_URL'] + path
     else
       host   = ENV['BOXEN_S3_HOST'] || 's3.amazonaws.com'
       bucket = ENV['BOXEN_S3_BUCKET'] || 'boxen-downloads'
-      "http://#{bucket}.#{host}/homebrew" + path
+      "https://#{host}/#{bucket}/homebrew" + path
     end
   end
 

diff --git a/lib/puppet/provider/homebrew_tap/default.rb b/lib/puppet/provider/homebrew_tap/default.rb
@@ -83,9 +83,6 @@ def command_opts
       :custom_environment => {
         "HOME"            => "/#{homedir_prefix}/#{default_user}",
         "PATH"            => "#{self.class.home}/bin:/usr/bin:/usr/sbin:/bin:/sbin",
-        "CFLAGS"          => "-O2",
-        "CPPFLAGS"        => "-O2",
-        "CXXFLAGS"        => "-O2",
         "HOMEBREW_ROOT"   => "#{self.class.home}",
       },
       :failonfail         => true,

diff --git a/lib/puppet/provider/package/homebrew.rb b/lib/puppet/provider/package/homebrew.rb
@@ -187,12 +187,8 @@ def command_opts
       :custom_environment => {
         "HOME"                      => "/#{homedir_prefix}/#{default_user}",
         "PATH"                      => "#{self.class.home}/bin:/usr/bin:/usr/sbin:/bin:/sbin",
-        "CFLAGS"                    => "-O2",
-        "CPPFLAGS"                  => "-O2",
-        "CXXFLAGS"                  => "-O2",
         "BOXEN_HOMEBREW_BOTTLE_URL" => bottle_url,
         "HOMEBREW_CACHE"            => self.class.cache,
-        "HOMEBREW_BUILD_BOTTLE"     => "1"
       },
       :failonfail         => true,
       :uid                => default_user