[Groonga-commit] groonga/heroku-buildpack-groonga at bacd58f [master] Expand environment variable value in profile.d

Back to archive index

Kouhei Sutou null+****@clear*****
Mon Jul 7 23:36:06 JST 2014


Kouhei Sutou	2014-07-07 23:36:06 +0900 (Mon, 07 Jul 2014)

  New Revision: bacd58f3cc57ed848bff858971994eb7f8013e49
  https://github.com/groonga/heroku-buildpack-groonga/commit/bacd58f3cc57ed848bff858971994eb7f8013e49

  Message:
    Expand environment variable value in profile.d

  Modified files:
    bin/compile

  Modified: bin/compile (+6 -1)
===================================================================
--- bin/compile    2014-07-07 23:34:55 +0900 (b2a9cb8)
+++ bin/compile    2014-07-07 23:36:06 +0900 (ef83a26)
@@ -101,6 +101,11 @@ Dir.chdir(build_dir) do
   profile_dir="#{build_dir}/.profile.d"
   FileUtils.mkdir_p(profile_dir)
   open("#{profile_dir}/groonga.sh", "w") do |env_file|
-    env_file.write("export LD_LIBRARY_PATH=#{app_dir}/#{prefix}/lib:$LD_LIBRARY_PATH")
+    ld_library_paths = [
+      "#{app_dir}/#{prefix}/lib",
+      ENV["LD_LIBRARY_PATH"]
+    ]
+    ld_library_path = ld_library_paths.compact.join(File::PATH_SEPARATOR)
+    env_file.write("export LD_LIBRARY_PATH=#{ld_library_path}")
   end
 end
-------------- next part --------------
HTML����������������������������...
下載 



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