diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-25 12:16:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-25 12:16:30 +0000 |
| commit | 033bf5e02523ee3386a305ae11afb8fbbd79f2a4 (patch) | |
| tree | 4077671de8e6db90234298dad49fcc2f7036bc10 | |
| parent | 5ec2b72e6cf36b52c9febff244a8d7fad656499e (diff) | |
| download | ruby-033bf5e02523ee3386a305ae11afb8fbbd79f2a4.tar.gz ruby-033bf5e02523ee3386a305ae11afb8fbbd79f2a4.tar.xz ruby-033bf5e02523ee3386a305ae11afb8fbbd79f2a4.zip | |
* instruby.rb (with_destdir): should return the given argument if no
DESTDIR is given.
* instruby.rb: use path name expansion of cmd.exe.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | instruby.rb | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Wed Feb 25 21:16:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * instruby.rb (with_destdir): should return the given argument if no + DESTDIR is given. + + * instruby.rb: use path name expansion of cmd.exe. + Wed Feb 25 20:44:45 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/cgi-lib.rb, lib/getopts.rb, lib/importenv.rb, lib/parsearg.rb: diff --git a/instruby.rb b/instruby.rb index e9f6f0aca..146bb2d4f 100644 --- a/instruby.rb +++ b/instruby.rb @@ -74,6 +74,7 @@ def makedirs(dirs) end def with_destdir(dir) + return dir if $destdir.empty? dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';' $destdir + dir end @@ -157,11 +158,11 @@ for src in Dir["bin/*"] open(with_destdir(batfile), "w") { |b| b.print <<EOH, shebang, body, <<EOF @echo off -if "%OS%" == "Windows_NT" goto WinNT +if not "%~d0" == "~d0" goto WinNT #{ruby_bin_dosish} -x "#{batfile}" %1 %2 %3 %4 %5 %6 %7 %8 %9 goto endofruby :WinNT -#{ruby_bin_dosish} -x "#{batfile}" %* +"%~dp0#{ruby_install_name}" -x "%~f0" %* goto endofruby EOH __END__ |