six-updater 0.17.5-x86-mswin32 → 0.17.6-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.5'
+  s.version = '0.17.6'
   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.5'
+  s.version = '0.17.6'
   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.5'
+  s.version = '0.17.6'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

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.5'
+    VERSION = '0.17.6'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
     FOLDER = /(.*)\/(.*)/
@@ -437,7 +437,10 @@ module Six
           mods = @mods.clone
           mods.gsub!(/\//, '-')
           mods2 = @mods.clone
-          mods2.gsub!('/', '\\')
+          case RUBY_PLATFORM
+            when /-mingw32$/, /-mswin32$/
+              mods2.gsub!('/', '\\')
+          end
           name = "Play ArmA2 with #{mods}.lnk"
           Win32::Shortcut.new(name) do |shortcut|
             shortcut.description = "Start Arma2 with #{mods2}"
@@ -445,9 +448,7 @@ module Six
             shortcut.working_directory = @config[:app_path]
             shortcut.arguments = "#{@config[:app_params]} -mod=#{mods2}"
           end
-          str = path.clone
-          str.gsub!('/', '\\')
-          log.info "Created shortcut (in #{str}): #{name}"
+          log.info "Created shortcut (in #{path}): #{name}"
           Dir.chdir cwd
         else
         log.warn "Unsupported on current Platform: #{RUBY_PLATFORM}"

data/lib/six/updater/mod.rb

@@ -200,10 +200,7 @@ module Six
               log.info "Found #{@folder_str}.7z, using it"
               #Six::Updater.zipcheck
               FileUtils.mkdir_p @path
-              cmd = "7z x -o#{esc(@path)} #{esc(file)}"
-              log.debug cmd
-              output = %x[#{cmd}]
-              log.debug output
+              log.debug unpack(file, @path)
 
               if File.exists?(File.join(@path, ".rsync", "config.yml"))
                 begin
@@ -257,6 +254,22 @@ module Six
         end
       end
 
+      def unpack(file, path = nil)
+        cmd = "7z x -y"
+        cmd << " -o#{esc(path)}" if path
+        cmd << " #{esc(file)}"
+        case RUBY_PLATFORM
+          when /-mingw32$/, /-mswin32$/
+            cmd.gsub!("/", "\\")
+        end
+
+        log.debug cmd
+        out = %x[#{cmd}]
+        log.warn "WARNING: Error unpacking #{path}: #{out}" if $? != 0
+        log.debug out
+        out
+      end
+
       def cleanup
         log.warn "CLEANUP Action unimplemented atm, please pick different action"
       end
@@ -304,9 +317,7 @@ module Six
             end
           else
             # TODO: Cleanup old keys, Ruby Tar library, examine content? - tarruby doesn't build on 1.9.1. mingw
-            cmd = "7z x #{esc(path)} -o #{esc(@config[:app_path])}"
-            cmd.gsub!("/", "\\")
-            system cmd
+            unpack(path, @config[:app_path])
           end
         end
       end
@@ -337,9 +348,7 @@ module Six
             FileUtils::mkdir_p uconfig unless File.exists?(uconfig)
             FileUtils::cp_r(path, uconfigpath)
           else
-            cmd = "7z x #{esc(path)} -o#{esc(@config[:app_path])} -y"
-            cmd.gsub!("/", "\\")
-            system cmd
+            unpack(path, @config[:app_path])
           end
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 17
-  - 5
-  version: 0.17.5
+  - 6
+  version: 0.17.6
 platform: x86-mswin32
 authors: 
 - Sickboy