six-updater 0.17.3-x86-mswin32 → 0.17.4-x86-mswin32

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.platform = "x86-mingw32"
   s.name = 'six-updater'
-  s.version = '0.17.3'
+  s.version = '0.17.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -35,7 +35,7 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.17.3'
+  s.version = '0.17.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -56,7 +56,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.17.3'
+  s.version = '0.17.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/updater-app.rb

@@ -15,21 +15,33 @@ module Six
         pid = File.open(PID_FILE) {|file| file.read}
         pid = pid.to_i
         found = false
+
         begin
-          out = %x[tasklist]
-          out.split("\n").each do |line|
-            line[/\Aruby\.exe[\t| ]*([0-9]*)/]
-            p = $1
-            if p
-              if p.size > 0
-                found = true if pid == p.to_i
+          case RUBY_PLATFORM
+            when /-mingw32$/, /-mswin32$/
+                out = %x[tasklist]
+                out.split("\n").each do |line|
+                  line[/\Aruby\.exe[\t| ]*([0-9]*)/]
+                  p = $1
+                  if p
+                    if p.size > 0
+                      found = true if pid == p.to_i
+                    end
+                  end
+                end
+            else
+              %x[ps -A | grep #{pid}].split("\n").each do |line|
+                unless line[/grep/]
+                  line[/^\s*([0-9]*)/]
+                  found = true if $1 == pid.to_s
+                end
               end
-            end
           end
         rescue
           log.warn "Failed checking tasklist for #{pid}"
           log.debug "#{$!}"
         end
+
         if found
           log.error "The program seems to be already running (PID: #{pid}). Please wait/close the other application first."
           log.info "If you believe this is in error, please delete #{PID_FILE}"

data/lib/six/updater.rb

@@ -38,7 +38,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.17.3'
+    VERSION = '0.17.4'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
     FOLDER = /(.*)\/(.*)/
@@ -209,7 +209,7 @@ module Six
 
       unless File.exists?(config)
         log.error "ERROR: #{config} config missing!"
-        wait
+        wait if @config[:wait]
         exit
       end
 
@@ -257,12 +257,12 @@ module Six
           @config[:app_path].gsub!('\\', '/')
         else
           log.error "No valid ArmA installation folder found, please abort!"
-          wait
+          wait if @config[:wait]
           exit
         end
       else
         log.error "No valid ArmA installation folder found, please abort!"
-        wait
+        wait if @config[:wait]
         exit
       end
 
@@ -272,7 +272,7 @@ module Six
           @config[:app_modpath].gsub!('\\', '/')
         else
           log.error "No valid Mod installation folder found, please abort!"
-          wait
+          wait if @config[:wait]
           exit
         end
       else
@@ -284,7 +284,7 @@ module Six
         a_prio = a[:priority] ? a[:priority] : 9999
         b_prio = b[:priority] ? b[:priority] : 9999
         a_prio <=> b_prio
-      end
+      end                                                procs
       log.debug "@config #{@config}"
 
       procs = find_process(process_name)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 17
-  - 3
-  version: 0.17.3
+  - 4
+  version: 0.17.4
 platform: x86-mswin32
 authors: 
 - Sickboy