six-launcher 0.1.4 → 0.1.5

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-launcher'
-  s.version = '0.1.4'
+  s.version = '0.1.5'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/launcher-app.rb

@@ -9,7 +9,7 @@ require 'win32/process'
 class Setup
   RUBY = "tools/ruby/bin/ruby.exe"
   GEM = "tools/ruby/bin/gem"
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
   #include Singleton
 
   BASE_PATH = if ENV['OCRA_EXECUTABLE']
@@ -35,6 +35,7 @@ class Setup
   end
   TOOL_PATH = File.join(BASE_PATH, 'tools')
   RUBY_PATH = File.join(TOOL_PATH, 'ruby')
+  RUBY_BIN = File.join(RUBY_PATH, 'bin', 'ruby.exe')
 
   def initialize(b = nil)
     verify_admin
@@ -66,7 +67,7 @@ class Setup
   end
 
   def rubycheck
-    update_ruby unless File.exists?(File.join(RUBY_PATH, 'bin', 'ruby.exe'))
+    update_ruby unless File.exists?(RUBY_BIN)
   end
 
   def bla
@@ -99,14 +100,14 @@ class Setup
     else
       b
     end
-    detached(File.join(RUBY_PATH, 'bin', 'ruby.exe'), cl, BASE_PATH)
+    detached(RUBY_BIN, cl, BASE_PATH)
   end
 
   def start_updater(params = nil)
     rubycheck
     update_gems
     puts "Starting Updater..."
-    detached(File.join(RUBY_PATH, 'bin', 'ruby.exe'), "-U -rubygems six-updater.rb #{params}", BASE_PATH)
+    detached(RUBY_BIN, "-U -rubygems six-updater.rb #{params}", BASE_PATH)
   end
 
   def detached(app, cl, path)
@@ -139,13 +140,13 @@ class Setup
     when "2"
       start_updater
     when "21"
-      start_updater("--install --startgame")
+      start_updater("--install --startgame --wait")
     when "22"
-      start_updater("--install --join")
+      start_updater("--install --join --wait")
     when "23"
-      start_updater("--startgame")
+      start_updater("--startgame --wait")
     when "24"
-      start_updater("--join")
+      start_updater("--join --wait")
     when "51"
       start_updater_web("--bind 0.0.0.0")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-launcher
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - ""
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +01:00
+date: 2009-11-13 00:00:00 +01:00
 default_executable: 
 dependencies: []