sslmate: general cleanup.

1 files changed, 28 insertions, 25 deletions

diff --git a/Library/Formula/sslmate.rb b/Library/Formula/sslmate.rb
index 988c03616..4847cc13f 100644
--- a/Library/Formula/sslmate.rb
+++ b/Library/Formula/sslmate.rb
@@ -5,26 +5,30 @@ class Sslmate < Formula
   url "https://packages.sslmate.com/other/sslmate-0.4.5.tar.gz"
   sha256 "1791eab553f763d92f28027fda5a04afdf8b3ef24c3e32cfe98441a68470b138"
 
-  depends_on "perl" if MacOS.version <= :snow_leopard
-  depends_on "curl" if MacOS.version <= :snow_leopard
-
-  resource "URI" do
-    url "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.64.tar.gz"
-    mirror "http://search.mcpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.64.tar.gz"
-    sha1 "80b43be09119f65f87ac3ab947c1e1cf0e0d0a8a"
-  end if MacOS.version <= :snow_leopard
-
-  resource "Term::ReadKey" do
-    url "http://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/TermReadKey-2.32.tar.gz"
-    mirror "http://search.mcpan.org/CPAN/authors/id/J/JS/JSTOWE/TermReadKey-2.32.tar.gz"
-    sha1 "0aef1009fca526d3a2ee4336584ff4cd69c2396e"
-  end if MacOS.version <= :snow_leopard
-
-  resource "JSON::PP" do
-    url "http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27300.tar.gz"
-    mirror "http://search.mcpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27300.tar.gz"
-    sha1 "21aea2dbed9507b9f62c5748893fc5431c715754"
-  end if MacOS.version <= :mountain_lion
+  if MacOS.version <= :snow_leopard
+    depends_on "perl"
+    depends_on "curl"
+
+    resource "URI" do
+      url "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.64.tar.gz"
+      mirror "http://search.mcpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.64.tar.gz"
+      sha1 "80b43be09119f65f87ac3ab947c1e1cf0e0d0a8a"
+    end
+
+    resource "Term::ReadKey" do
+      url "http://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/TermReadKey-2.32.tar.gz"
+      mirror "http://search.mcpan.org/CPAN/authors/id/J/JS/JSTOWE/TermReadKey-2.32.tar.gz"
+      sha1 "0aef1009fca526d3a2ee4336584ff4cd69c2396e"
+    end
+  end
+
+  if MacOS.version <= :mountain_lion
+    resource "JSON::PP" do
+      url "http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27300.tar.gz"
+      mirror "http://search.mcpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27300.tar.gz"
+      sha1 "21aea2dbed9507b9f62c5748893fc5431c715754"
+    end
+  end
 
   def install
     if MacOS.version <= :snow_leopard
@@ -43,13 +47,12 @@ class Sslmate < Formula
     bin.install "bin/sslmate"
     doc.install "README", "NEWS"
     man1.install "man/man1/sslmate.1"
+
+    env = { :PERL5LIB => ENV["PERL5LIB"] }
     if MacOS.version <= :snow_leopard
-      # Make sure to use Perl and Curl from the Cellar, rather than the system:
-      bin.env_script_all_files(libexec + "bin", :PERL5LIB => ENV["PERL5LIB"],
-              :PATH => "#{Formula["perl"].bin}:#{Formula["curl"].bin}:$PATH")
-    else
-      bin.env_script_all_files(libexec + "bin", :PERL5LIB => ENV["PERL5LIB"])
+      env[:PATH] = "#{Formula["perl"].bin}:#{Formula["curl"].bin}:$PATH"
     end
+    bin.env_script_all_files(libexec + "bin", env)
   end
 
   test do