* instruby.rb (with_destdir): should return the given argument if no

nobu · nobu · commit 0313f4cee531 · 2004-02-25T12:16:30.000Z
DESTDIR is given.

* instruby.rb: use path name expansion of cmd.exe.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 25 21:16:25 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 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* error.c (NameError::Message): new class for lazy evaluation of
@@ -9,7 +16,7 @@ Wed Feb 25 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 Tue Feb 24 18:59:37  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* dir.c (glob_helper): '**/' should not match leading period 
+	* dir.c (glob_helper): '**/' should not match leading period
 	  unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
 
 Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>
@@ -26,12 +33,12 @@ Tue Feb 24 07:23:30 2004  Dave Thomas  <dave@pragprog.com>
 
 Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle 
+	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
 	  class variables in code listings
 
 Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle 
+	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
 	  class variables in code listings
 
 Tue Feb 24 06:32:27 2004  Dave Thomas  <dave@pragprog.com>
@@ -46,7 +53,7 @@ Tue Feb 24 06:16:22 2004  Dave Thomas  <dave@pragprog.com>
 
 Tue Feb 24 06:08:47 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant): 
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
 	  Start collecting text of constant values earlier: was missing
 	  values in output if there was no space after '='
 
diff --git a/instruby.rb b/instruby.rb
@@ -72,6 +72,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
@@ -155,11 +156,11 @@ def with_destdir(dir)
     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__
