six-updater-web 0.12.5 → 0.12.6

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.12.5'
+  s.version = '0.12.6'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/config/six-updater-web.rb

@@ -10,7 +10,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.12.5"
+  VERSION = "0.12.6"
 
   COMPONENT = "six-updater-web"
   SIX_PORT = 3000 unless defined?(SIX_PORT)
@@ -23,8 +23,8 @@ module SixUpdaterWeb
   ARMA2_STEAM = ['SOFTWARE\\Valve\\Steam\\Common\\ARMA 2', 'InstallPath']
 
   bpath = if ENV['BASE_PATH']
-    OLDLOCATION = ENV['BASE_PATH'] unless defined?(OLDLOCATION)
-    ENV['BASE_PATH']
+    OLDLOCATION = "#{ENV['BASE_PATH']}" unless defined?(OLDLOCATION)
+    "#{ENV['BASE_PATH']}"
   elsif defined?(OLDLOCATION)
     OLDLOCATION
   else
@@ -36,7 +36,7 @@ module SixUpdaterWeb
   TOOL_PATH = File.join(BASE_PATH, 'tools')
   RUBY_PATH = File.join(TOOL_PATH, "ruby", "bin")
   #RUB_PATH = "tools/ruby/bin"
-  ENV['PATH'] = "#{RUBY_PATH};#{TOOL_PATH};".gsub("/", "\\") + ENV['PATH']
+
   args = ARGV.join(" ")
   if args[/RAILS_ENV=(\w)/]
     ENV["RAILS_ENV"] = $1
@@ -60,7 +60,7 @@ module SixUpdaterWeb
     when /-mingw32$/, /-mswin32$/
       TEMP_PATH = if ENV['TEMP']
         if ENV['TEMP'].size > 0
-          File.directory?(ENV['TEMP']) ? ENV['TEMP'] : BASE_PATH
+          File.directory?(ENV['TEMP']) ? ENV['TEMP'].clone : BASE_PATH
         else
           BASE_PATH
         end
@@ -75,7 +75,6 @@ module SixUpdaterWeb
       # But requires everyone to update to it, unless we do it for them :D
       path = File.join(BASE_PATH, "tools")
       rubypath = File.join(path, 'ruby', 'bin')
-      rubypath.gsub!("/", "\\")
       tpath = "#{path};#{File.join(path, 'bin')};#{rubypath}"
       tpath.gsub!('/', '\\')
       ENV['PATH'] = "" unless ENV['PATH']
@@ -127,17 +126,20 @@ module SixUpdaterWeb
         case RUBY_PLATFORM
           when /-mingw32$/, /-mswin32$/
             return unless defined?(OPEN_BROWSER)
-            file_to_use = "#{LOCAL_URL}:#{SIX_PORT}/main"
-            arguments = nil
-            directory = nil
-            operation = "OPEN"
-            show = nil
-            begin
-              shell = WIN32OLE.new('Shell.Application')
-              shell.ShellExecute(file_to_use, arguments, directory, operation, show)
-            rescue
-              #logger.warn "Unable to open browser: #{$!}"
-            end
+            #Thread.new() do
+              file_to_use = "#{LOCAL_URL}:#{SIX_PORT}/main"
+              arguments = nil
+              directory = nil
+              operation = "OPEN"
+              show = nil
+             # sleep 3
+              begin
+                shell = WIN32OLE.new('Shell.Application')
+                shell.ShellExecute(file_to_use, arguments, directory, operation, show)
+              rescue
+                #logger.warn "Unable to open browser: #{$!}"
+              end
+            #end
         end
       end
     end
@@ -148,6 +150,8 @@ module SixUpdaterWeb
   def run_program(path, app_path, startpath, cl)
     logger.info "Current Path: #{Dir.pwd}, BASE_PATH: #{BASE_PATH}, DATA_PATH: #{DATA_PATH}"
     logger.info "Starting with #{cl} from #{startpath}" #, with #{path}"
+    # TODO: Cleanup
+    startpath = "#{startpath}"
     begin
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/
@@ -173,9 +177,9 @@ module SixUpdaterWeb
           end
           #logger.info "Unimplemented on current platform: #{RUBY_PLATFORM}"
       end
-    rescue
+    rescue => e
       logger.info "WARNING: Something went wrong starting the app"
-      logger.info "#{$!}"
+      logger.info "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 5
-  version: 0.12.5
+  - 6
+  version: 0.12.6
 platform: ruby
 authors: 
 - Sickboy