riak 1.4.0 #21186
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,28 +4,27 @@ class Riak < Formula | |
| homepage 'http://wiki.basho.com/Riak.html' | ||
|
|
||
| if Hardware.is_64_bit? and not build.build_32_bit? | ||
| url 'http://s3.amazonaws.com/downloads.basho.com/riak/1.4/1.4.0/osx/10.8/riak-1.4.0-OSX-x86_64.tar.gz' | ||
| version '1.4.0-x86_64' | ||
| sha256 '4830b9e00b520b8494264017bfc2ff10753fd51b9e013bafd3054e29e5be1443' | ||
| end | ||
|
There was a problem hiding this comment. Need to remove the *entire* conditional (i.e don't wrap these attributes in an if statement at all); it doesn't serve any purpose unless the package provides both 32- and 64-bit versions. |
||
|
|
||
| depends_on :arch => :x86_64 | ||
|
|
||
| # patch scripts to work with homebrew symlinking | ||
| def patches | ||
| [ | ||
| "https://gist.github.com/erbmicha/5970803/raw", # env.sh patch | ||
|
There was a problem hiding this comment. I like the other approach of just hardcoding the Homebrew path instead. There was a problem hiding this comment. It was designed to work for all symlinking, not just homebrew. This way Basho can use it in their build process for other products. On Jul 13, 2013, at 9:50 AM, Adam Vandenberg [email protected] wrote:
There was a problem hiding this comment. When they accept it upstream then we won't need a patch, but in the meantime, the approach used in the other riak 1.4.0 submission has a smaller footprint. There was a problem hiding this comment. If by "they" you mean Basho, then you are correct, but I've been told that won't be until the next release and then the formula will be updated accordingly. On Jul 13, 2013, at 12:04 PM, Adam Vandenberg [email protected] wrote:
|
||
| "https://gist.github.com/erbmicha/5970790/raw", # riak patch | ||
| "https://gist.github.com/erbmicha/5972538/raw", # search-cmd patch | ||
| "https://gist.github.com/erbmicha/5972526/raw", # riak-admin patch | ||
| "https://gist.github.com/erbmicha/5972531/raw", # riak-debug patch | ||
| ] | ||
| end | ||
|
|
||
| def install | ||
| prefix.install Dir['*'] | ||
| rm Dir.glob("#{bin}/*.orig") # get rid of the patch backups before symlinking to bin | ||
|
There was a problem hiding this comment. Remove files before installing. |
||
| bin.install_symlink Dir["#{libexec}/bin/*"] | ||
| end | ||
| end | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This conditional needs to be removed; it's not OK to print stuff in the DSL section of the formula, as that means it will be printed every time this formula is loaded on 32-bit systems. The
depends_on :arch => :x86_64tells Homebrew to print an appropriate warning and disallow installing on such platforms.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed. Sending a new pull request...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you cancel this pull request so I can send a new one? It won't let me send while this is open.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can force-push back to the same branch and the current pull request will be updated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nevermind. I didn't realize that the pull request would update with subsequent commits to the files included. Neat :)