summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-24 07:27:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-24 07:27:18 +0000
commit5a4f004d744a8cbc5f2ada61ac9a15fe9dd9ed8b (patch)
tree7c8c24b301eefc74bd318f0179bf8057790b2cfd
parentee1cfc11e33f205bdbfc569414da6f388d9f58d8 (diff)
* tool/rbinstall.rb: expand target file name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xtool/rbinstall.rb9
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 99bfad5883..8134321fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sat Apr 24 16:20:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 24 16:27:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/rbinstall.rb: expand target file name.
* template/fake.rb.in: no need for hook if extmk.
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index cf5827e6e2..845efcb73f 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -407,7 +407,7 @@ install?(:local, :comm, :bin, :'bin-comm') do
next unless File.file?(src)
next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
- name = trans[File.basename(src)]
+ name = RbConfig.expand(trans[File.basename(src)])
shebang = ''
body = ''
@@ -424,7 +424,7 @@ install?(:local, :comm, :bin, :'bin-comm') do
open_for_install(cmd, $script_mode) do
case $cmdtype
when "bat"
- [<<-"EOH".gsub(/^\s+/, ''), shebang, body, <<-"EOF".gsub(/^\s+/, '')].join.gsub(/$/, "\r")
+ [<<-"EOH".gsub(/^\s+/, ''), shebang, body, "__END__\n:endofruby\n"].join.gsub(/$/, "\r")
@echo off
@if not "%~d0" == "~d0" goto WinNT
#{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9
@@ -433,11 +433,8 @@ install?(:local, :comm, :bin, :'bin-comm') do
"%~dp0#{ruby_install_name}" -x "%~f0" %*
@goto endofruby
EOH
- __END__
- :endofruby
- EOF
when "cmd"
- "#{<<"/EOH"}#{shebang}#{body}"
+ <<"/EOH" << shebang << body
@"%~dp0#{ruby_install_name}" -x "%~f0" %*
@exit /b %ERRORLEVEL%
/EOH