diff options
| author | Jack Nagel | 2014-07-18 22:42:47 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-18 22:42:47 -0500 |
| commit | 30bf648c3e9ffb24b2ed54560b1a7ba1b7196f0e (patch) | |
| tree | a321611fedb9266e6ca962022d5110953432474b /Library | |
| parent | 24fc341c9272ea1a5a9c0abc4981bd41d9f96a25 (diff) | |
| download | homebrew-30bf648c3e9ffb24b2ed54560b1a7ba1b7196f0e.tar.bz2 | |
Simplify resource installation
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/appscale-tools.rb | 15 | ||||
| -rw-r--r-- | Library/Formula/awscli.rb | 12 | ||||
| -rw-r--r-- | Library/Formula/cheat.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/euca2ools.rb | 9 | ||||
| -rw-r--r-- | Library/Formula/fig.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/ino.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/saltstack.rb | 16 |
7 files changed, 15 insertions, 47 deletions
diff --git a/Library/Formula/appscale-tools.rb b/Library/Formula/appscale-tools.rb index 5248d1df5..9bfb5a2c6 100644 --- a/Library/Formula/appscale-tools.rb +++ b/Library/Formula/appscale-tools.rb @@ -56,17 +56,10 @@ class AppscaleTools < Formula def install ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages" - install_args = [ "setup.py", "install", "--prefix=#{libexec}" ] - - resource("termcolor").stage { system "python", *install_args } - resource("pyyaml").stage { system "python", *install_args } - resource("SOAPpy").stage { system "python", *install_args } - resource("boto").stage { system "python", *install_args } - resource("argparse").stage { system "python", *install_args } - resource("oauth2client").stage { system "python", *install_args } - resource("google-api-python-client").stage { system "python", *install_args } - resource("httplib2").stage { system "python", *install_args } - resource("python-gflags").stage { system "python", *install_args } + + resources.each do |r| + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } + end inreplace Dir["bin/appscale*"] do |s| s.gsub! /^lib = os.*/, "lib = '#{libexec}'" diff --git a/Library/Formula/awscli.rb b/Library/Formula/awscli.rb index be38c24c1..3946eef89 100644 --- a/Library/Formula/awscli.rb +++ b/Library/Formula/awscli.rb @@ -63,19 +63,11 @@ class Awscli < Formula def install ENV["PYTHONPATH"] = lib+"python2.7/site-packages" ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages" - install_args = [ "setup.py", "install", "--prefix=#{libexec}" ] - if build.head? then - resource("jmespath").stage { system "python", *install_args } + resources.each do |r| + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } end - resource("botocore").stage { system "python", *install_args } - resource("bcdoc").stage { system "python", *install_args } - resource("six").stage { system "python", *install_args } - resource("colorama").stage { system "python", *install_args } - resource("docutils").stage { system "python", *install_args } - resource("rsa").stage { system "python", *install_args } - system "python", "setup.py", "install", "--prefix=#{prefix}", "--single-version-externally-managed", "--record=installed.txt" diff --git a/Library/Formula/cheat.rb b/Library/Formula/cheat.rb index 967d92ed3..eff9a218b 100644 --- a/Library/Formula/cheat.rb +++ b/Library/Formula/cheat.rb @@ -29,10 +29,8 @@ class Cheat < Formula ENV["PYTHONPATH"] = lib+"python2.7/site-packages" ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages" - install_args = [ "setup.py", "install", "--prefix=#{libexec}" ] - resources.each do |r| - r.stage { system "python", *install_args } + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } end system "python", "setup.py", "install", "--prefix=#{prefix}" diff --git a/Library/Formula/euca2ools.rb b/Library/Formula/euca2ools.rb index 3fb484342..d4d6e2be8 100644 --- a/Library/Formula/euca2ools.rb +++ b/Library/Formula/euca2ools.rb @@ -36,13 +36,10 @@ class Euca2ools < Formula def install ENV["PYTHONPATH"] = lib+"python2.7/site-packages" ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages" - install_args = ["setup.py", "install", "--prefix=#{libexec}"] - resource("requestbuilder").stage { system "python", *install_args } - resource("requests").stage { system "python", *install_args } - resource("setuptools").stage { system "python", *install_args } - resource("lxml").stage { system "python", *install_args } - resource("six").stage { system "python", *install_args } + resources.each do |r| + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } + end system "python", "setup.py", "install", "--single-version-externally-managed", "--record=installed.txt", "--prefix=#{prefix}" diff --git a/Library/Formula/fig.rb b/Library/Formula/fig.rb index e9edfbf16..7e313aed3 100644 --- a/Library/Formula/fig.rb +++ b/Library/Formula/fig.rb @@ -50,9 +50,8 @@ class Fig < Formula ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages" ENV.prepend_create_path "PYTHONPATH", prefix+"lib/python2.7/site-packages" - install_args = ["setup.py", "install", "--prefix=#{libexec}"] resources.each do |r| - r.stage { system "python", *install_args } + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } end system "python", "setup.py", "install", "--prefix=#{prefix}" diff --git a/Library/Formula/ino.rb b/Library/Formula/ino.rb index 346e326fc..4d26e4236 100644 --- a/Library/Formula/ino.rb +++ b/Library/Formula/ino.rb @@ -47,10 +47,9 @@ class Ino < Formula ENV["PYTHONPATH"] = lib+"python2.7/site-packages" ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages" ENV.prepend_create_path "PYTHONPATH", prefix+"lib/python2.7/site-packages" - install_args = ["setup.py", "install", "--prefix=#{libexec}"] resources.each do |r| - r.stage { system "python", *install_args } + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } end system "python", "setup.py", "install", "--prefix=#{prefix}" diff --git a/Library/Formula/saltstack.rb b/Library/Formula/saltstack.rb index bd66f3763..4bc6fd991 100644 --- a/Library/Formula/saltstack.rb +++ b/Library/Formula/saltstack.rb @@ -79,19 +79,9 @@ class Saltstack < Formula def install ENV["PYTHONPATH"] = lib+"python2.7/site-packages" ENV.prepend_create_path 'PYTHONPATH', libexec+'lib/python2.7/site-packages' - install_args = [ "setup.py", "install", "--prefix=#{libexec}" ] - - resource('pycrypto').stage { system "python", *install_args } - resource('pyyaml').stage { system "python", *install_args } - resource('pyzmq').stage { system "python", *install_args } - resource('msgpack-python').stage { system "python", *install_args } - resource('markupsafe').stage { system "python", *install_args } - resource('m2crypto').stage { system "python", *install_args } - resource('jinja2').stage { system "python", *install_args } - resource('apache-libcloud').stage { system "python", *install_args } - - if build.head? - resource('requests').stage { system "python", *install_args } + + resources.each do |r| + r.stage { system "python", "setup.py", "install", "--prefix=#{libexec}" } end system "python", "setup.py", "install", "--prefix=#{prefix}" |
