diff -ur rubyscript2exe-0.1.6.tar.gz rubyscript2exe-0.1.7.tar.gz

diff -ur rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/eee.pas rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/eee.pas
--- rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/eee.pas	2003年10月31日 01:02:22.000000000 +0100
+++ rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/eee.pas	2003年11月07日 23:38:31.000000000 +0100
@@ -246,7 +246,6 @@
 
 begin
 
- tempdir	:= ´c:\tmp´;
 tempdir	:= getenv(´TEMP´);
 
 me		:= ´Dit is mijn herkennigsstring voor het herkennen van pakin of pakuit mode.´;
diff -ur rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/init.rb rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/init.rb
--- rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/init.rb	2003年10月31日 01:06:11.000000000 +0100
+++ rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/init.rb	2003年11月07日 21:57:49.000000000 +0100
@@ -1,9 +1,15 @@
 require "ev/oldandnewlocation"
 require "rbconfig"
 
-app	= ARGV.shift
+script	= ARGV.shift
 
-RubyW	= ARGV.include?("--rubyscript2exe-rubyw")
+rubyw	= false
+rubyw	= true		if script =~ /\.rbw$/
+rubyw	= false		if ARGV.include?("--rubyscript2exe-ruby")
+rubyw	= true		if ARGV.include?("--rubyscript2exe-rubyw")
+
+rubyexe	= "ruby.exe"
+rubyexe	= "rubyw.exe"	if rubyw
 
 ARGV.delete_if do |arg|
 arg =~ /^--rubyscript2exe-/
@@ -15,11 +21,9 @@
 olddir	= oldlocation.gsub!(/\//, "\\")
 newdir	= newlocation.gsub!(/\//, "\\")
 
-ruby	= "ruby"
-ruby	= "rubyw"	if RubyW
-
-if not app.nil?
- app	= app.dup.gsub(/\.rb$/, "")
+if not script.nil?
+ script	= "#{script}.rb"	if not script =~ /\.rbw?$/
+ app		= script.gsub(/\.rbw?$/, "")
 
 puts "Tracing #{app}..."
 
@@ -27,36 +31,36 @@
 tar = FileTest.file?("tar.exe")
 system("copy #{newdir}\\tar.exe . > nul:")	if not tar
 
- system("#{Config::CONFIG["bindir"]}\\ruby -r #{newdir}\\require2tar.rb #{app}.rb #{ARGV.collect{|a| "´" + a + "´"}.join(" ")}")	# eval ???
+ system("#{Config::CONFIG["bindir"]}\\ruby -r #{newdir}\\require2tar.rb #{script} #{ARGV.collect{|a| "´" + a + "´"}.join(" ")}")
 
 system("del tar.exe > nul:")		if not tar
 end
 
 puts "Gathering files..."
 
- system("copy #{Config::CONFIG["bindir"]}\\#{ruby}.exe . > nul:")
+ system("copy #{Config::CONFIG["bindir"]}\\#{rubyexe} . > nul:")
 system("copy #{Config::CONFIG["bindir"]}\\#{Config::CONFIG["LIBRUBY_SO"]} . > nul:")
 system("move #{olddir}\\rubyrequired.tar . > nul:")
- system("copy #{olddir}\\#{app}.rb app.rb > nul:")
+ system("copy #{olddir}\\#{script} app.rb > nul:")
 
 puts "Packing..."
 
 system("#{Config::CONFIG["bindir"]}\\ruby tar2rubyscript.rb rubyrequired.tar")
 
 File.open("app.eee", "w") do |f|
- f.puts "f #{ruby}.exe"
+ f.puts "f #{rubyexe}"
 f.puts "f #{Config::CONFIG["LIBRUBY_SO"]}"
 f.puts "f rubyrequired.rb"
 f.puts "f app.rb"
 
- f.puts "t #{ruby} rubyrequired.rb --tar2rubyscript-justextract"
+ f.puts "t #{rubyexe} rubyrequired.rb --tar2rubyscript-justextract"
 
- f.puts "c %tempdir%\\#{ruby} -I %tempdir%\\rubyrequired %tempdir%\\app.rb %parms%"
+ f.puts "c %tempdir%\\#{rubyexe} -I %tempdir%\\rubyrequired %tempdir%\\app.rb %parms%"
 end
 
 puts "Creating #{app}.exe..."
 
- if RubyW
+ if rubyw
 system("eeew.exe app.eee #{olddir}\\#{app}.exe")
 else
 system("eee.exe app.eee #{olddir}\\#{app}.exe")
diff -ur rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/tarrubyscript.rb rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/tarrubyscript.rb
--- rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/tarrubyscript.rb	2003年10月31日 01:14:37.000000000 +0100
+++ rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/tarrubyscript.rb	2003年11月08日 20:06:19.000000000 +0100
@@ -191,7 +191,7 @@
 
 @@tempspace	= self
 
- @newdir=@tempdir
+ @newdir	= @tempdir
 end
 
 def extract
@@ -358,6 +358,8 @@
 else
 TempSpace.new.extract
 
+ 0ドル	= "./init.rb"
+
 newlocation do
 load "init.rb"
 end
Binary files rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/eee.exe and rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/eee.exe differ
Binary files rubyscript2exe-0.1.6.tar.gz/rubyscript2exe/eeew.exe and rubyscript2exe-0.1.7.tar.gz/rubyscript2exe/eeew.exe differ