diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/salt.rb | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/Library/Formula/salt.rb b/Library/Formula/salt.rb index d93cd8f18..c878a10ae 100644 --- a/Library/Formula/salt.rb +++ b/Library/Formula/salt.rb @@ -73,8 +73,6 @@ class Salt < Formula url 'http://supernovae.in2p3.fr/~guy/salt/download/snfit-2.2.2b.tar.gz' sha1 'e435ca19d22800f95f5363038297593ec4dae97f' - option 'with-data', 'Install model data' - def install_subbrew(subbrew, installdir) s = subbrew.new s.brew do @@ -104,25 +102,23 @@ class Salt < Formula # install all the model data # http://supernovae.in2p3.fr/~guy/salt/download/snls3-intallation.sh - if build.include? 'with-data' - data = prefix/'data' - data.mkpath - File.open(data/'fitmodel.card', 'w') do |fitmodel| - # salt2 model + magsys - [SaltSALT2, SaltVEGA, SaltSDSS_AB_off, SaltVEGAHST].each do |cls| - fitmodel.write(install_subbrew(cls, data)) - end - # instruments - inst = data + 'Instruments' - [SaltSTANDARD, SaltMEGACAM, SaltKEPLERCAM, Salt4SHOOTER2, SaltSDSS, - SaltSWOPE, SaltACSWF, SaltNICMOS2].each do |cls| - fitmodel.write(install_subbrew(cls, inst)) - end + data = prefix/'data' + data.mkpath + File.open(data/'fitmodel.card', 'w') do |fitmodel| + # salt2 model + magsys + [SaltSALT2, SaltVEGA, SaltSDSS_AB_off, SaltVEGAHST].each do |cls| + fitmodel.write(install_subbrew(cls, data)) + end + # instruments + inst = data + 'Instruments' + [SaltSTANDARD, SaltMEGACAM, SaltKEPLERCAM, Salt4SHOOTER2, SaltSDSS, + SaltSWOPE, SaltACSWF, SaltNICMOS2].each do |cls| + fitmodel.write(install_subbrew(cls, inst)) end - - # for testing - Salt04D3gx.new.brew { (prefix + '04D3gx').install Dir['*'] } end + + # for testing + Salt04D3gx.new.brew { (prefix + '04D3gx').install Dir['*'] } end test do @@ -134,12 +130,10 @@ class Salt < Formula end def caveats - if build.include? 'with-data' - <<-EOS.undent - You should add the following to your .bashrc or equivalent: - export PATHMODEL=#{prefix}/data - EOS - end + <<-EOS.undent + You should add the following to your .bashrc or equivalent: + export PATHMODEL=#{prefix}/data + EOS end end |