diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | instruby.rb | 20 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 20 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Fri Mar 21 09:24:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * instruby.rb (open_for_install): write block result and rewrite only + if changed from existing file. + Wed Mar 19 21:01:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed diff --git a/instruby.rb b/instruby.rb index aa93e6a721..0201f28883 100755 --- a/instruby.rb +++ b/instruby.rb @@ -80,7 +80,7 @@ def parse_args(argv = ARGV) $mflags.unshift(*mflags) def $mflags.set?(flag) - grep(/\A-(?!-).*#{'%c' % flag}/i) { return true } + grep(/\A-(?!-).*#{flag.chr}/i) { return true } false end def $mflags.defined?(var) @@ -183,9 +183,13 @@ def install_recursive(srcdir, dest, options = {}) end end -def open_for_install(path, mode, &block) +def open_for_install(path, mode) + data = open(realpath = with_destdir(path), "rb") {|f| f.read} rescue nil + newdata = yield unless $dryrun - open(realpath = with_destdir(path), "wb", mode, &block) + unless newdata == data + open(realpath, "wb", mode) {|f| f.write newdata} + end File.chmod(mode, realpath) end $installed_list.puts path if $installed_list @@ -280,7 +284,7 @@ install?(:local, :comm, :bin, :'bin-comm') do makedirs [bindir, rubylibdir] ruby_shebang = File.join(bindir, ruby_install_name) - if $cmdtype + if File::ALT_SEPARATOR ruby_bin = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR) end for src in Dir["bin/*"] @@ -301,10 +305,10 @@ install?(:local, :comm, :bin, :'bin-comm') do cmd = File.join(bindir, name) cmd << ".#{$cmdtype}" if $cmdtype - open_for_install(cmd, $script_mode) do |f| + open_for_install(cmd, $script_mode) do case $cmdtype when "bat" - f.print((<<EOH+shebang+body+<<EOF).gsub(/$/, "\r")) + "#{<<EOH}#{shebang}#{body}#{<<EOF}".gsub(/$/, "\r") @echo off @if not "%~d0" == "~d0" goto WinNT #{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9 @@ -317,12 +321,12 @@ __END__ :endofruby EOF when "cmd" - f.print(<<EOH, shebang, body) + "#{<<EOH}#{shebang}#{body}" @"%~dp0#{ruby_install_name}" -x "%~f0" %* @exit /b %ERRORLEVEL% EOH else - f.print shebang, body + shebang + body end end end @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-03-19" +#define RUBY_RELEASE_DATE "2008-03-21" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080319 +#define RUBY_RELEASE_CODE 20080321 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |