From 90e16733988880af9acbdbc55ea4e9c95be7c40d Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 27 Dec 2008 15:44:51 +0000
Subject: * runruby.rb: refactored to modify ENV as once.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  |  4 ++++
 runruby.rb | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc574d397..0a0d2a425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 28 00:43:33 2008  Tanaka Akira  <akr@fsij.org>
+
+	* runruby.rb: refactored to modify ENV as once.
+
 Sat Dec 27 22:41:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/rdoc/test_rdoc_info_formatting.rb (setup, teadown): uses
diff --git a/runruby.rb b/runruby.rb
index 8b0e9c20e..c43978404 100755
--- a/runruby.rb
+++ b/runruby.rb
@@ -44,28 +44,36 @@ if extout
 end
 libs << File.expand_path("lib", srcdir)
 config["bindir"] = abs_archdir
-ENV["RUBY"] = File.expand_path(ruby)
-ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
+
+env = {}
+
+env["RUBY"] = File.expand_path(ruby)
+env["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
 
 if pure
   libs << File.expand_path("ext", srcdir) << "-"
 elsif e = ENV["RUBYLIB"]
   libs |= e.split(File::PATH_SEPARATOR)
 end
-ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
+env["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
 
 libruby_so = File.join(abs_archdir, config['LIBRUBY_SO'])
 if File.file?(libruby_so)
   if e = config['LIBPATHENV'] and !e.empty?
-    ENV[e] = [abs_archdir, ENV[e]].compact.join(File::PATH_SEPARATOR)
+    env[e] = [abs_archdir, ENV[e]].compact.join(File::PATH_SEPARATOR)
   end
   if /linux/ =~ RUBY_PLATFORM
-    ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ')
+    env["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ')
   end
 end
 
+ENV.update env
+
 cmd = [ruby]
 cmd << "-rpurelib.rb" if pure
 cmd.concat(ARGV)
 cmd.unshift(*debugger) if debugger
+
+#require 'shellwords'; puts Shellwords.join(env.map {|k,v| "#{k}=#{v}" } + cmd)
+
 exec(*cmd)
-- 
cgit