mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* tool/rbinstall.rb: expand target file name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ee1cfc11e3
commit
5a4f004d74
2 changed files with 6 additions and 7 deletions
|
@ -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.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue