[Groonga-commit] groonga/groonga at 3adb81d [master] Use options instead of ENV

Back to archive index

Kouhei Sutou null+****@clear*****
Sat Jan 23 12:45:33 JST 2016


Kouhei Sutou	2016-01-23 12:45:33 +0900 (Sat, 23 Jan 2016)

  New Revision: 3adb81d9227a7cf4c7a7439c818334b69df9a684
  https://github.com/groonga/groonga/commit/3adb81d9227a7cf4c7a7439c818334b69df9a684

  Message:
    Use options instead of ENV

  Modified files:
    vendor/download_mecab.rb

  Modified: vendor/download_mecab.rb (+14 -11)
===================================================================
--- vendor/download_mecab.rb    2016-01-23 11:57:03 +0900 (049a2e7)
+++ vendor/download_mecab.rb    2016-01-23 12:45:33 +0900 (8de45de)
@@ -34,9 +34,22 @@ def extract_tar_gz(tar_gz_path)
 end
 
 def download(url, base)
+  ssl_ca_cert = nil
+  if /mingw/ =~ RUBY_PLATFORM
+    cacert_pem_path = "cacert.pem"
+    unless File.exist?(cacert_pem_path)
+      open("http://curl.haxx.se/ca/cacert.pem") do |remote_cacert_pem|
+        File.open(cacert_pem_path, "wb") do |local_cacert_pem|
+          local_cacert_pem.print(remote_cacert_pem.read)
+        end
+      end
+    end
+    ssl_ca_cert = File.expand_path(cacert_pem_path)
+  end
+
   tar = "#{base}.tar"
   tar_gz = "#{tar}.gz"
-  open(url) do |remote_tar_gz|
+  open(url, :ssl_ca_cert => ssl_ca_cert) do |remote_tar_gz|
     File.open(tar_gz, "wb") do |local_tar_gz|
       local_tar_gz.print(remote_tar_gz.read)
     end
@@ -46,16 +59,6 @@ def download(url, base)
   FileUtils.rm_rf(tar_gz)
 end
 
-if /mingw/ =~ RUBY_PLATFORM
-  cacert_pem_path = "cacert.pem"
-  open("http://curl.haxx.se/ca/cacert.pem") do |remote_cacert_pem|
-    File.open(cacert_pem_path, "wb") do |local_cacert_pem|
-      local_cacert_pem.print(remote_cacert_pem.read)
-    end
-  end
-  ENV["SSL_CERT_FILE"] = File.expand_path(cacert_pem_path)
-end
-
 download("https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE",
          mecab_base)
 
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index