From 86840d939eb63b69e9503ba2e9f69f1bd2f5ae56 Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Wed, 7 May 2014 14:31:32 -0700 Subject: [PATCH] Include a formula's revision in its version number This ensures that e.g. the current package of wget or boost can be built. --- brew-pkg.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/brew-pkg.rb b/brew-pkg.rb index 7cd85b7..87b6555 100755 --- a/brew-pkg.rb +++ b/brew-pkg.rb @@ -40,6 +40,7 @@ def pkg name = f.name identifier = identifier_prefix + ".#{name}" version = f.version.to_s + version += "_#{f.revision}" if f.revision.to_s != '0' # Make sure it's installed first if not f.installed? @@ -61,9 +62,12 @@ def pkg pkgs.each do |pkg| formula = Formula.factory(pkg.to_s) + dep_version = formula.version.to_s + dep_version += "_#{formula.revision}" if formula.revision.to_s != '0' + ohai "Staging formula #{formula.name}" # Get all directories for this keg, rsync to the staging root - dirs = Pathname.new(File.join(HOMEBREW_CELLAR, formula.name, formula.version.to_s)).children.select { |c| c.directory? }.collect { |p| p.to_s } + dirs = Pathname.new(File.join(HOMEBREW_CELLAR, formula.name, dep_version)).children.select { |c| c.directory? }.collect { |p| p.to_s } dirs.each {|d| safe_system "rsync", "-a", "#{d}", "#{staging_root}/" } # Write out a LaunchDaemon plist if we have one