six-updater 0.10.7 → 0.10.8

data/Rakefile

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

data/lib/six/updater.rb

@@ -44,7 +44,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.10.7'
+    VERSION = '0.10.8'
     COMPONENT = 'six-updater'
 
     # Configuration
@@ -74,6 +74,12 @@ module Six
       p
     end
     TOOL_PATH = File.join(BASE_PATH, 'tools')
+    DOWNLOADER = if File.exists?(File.join(TOOL_PATH, 'six-downloader.rb'))
+      "\"#{File.join(TOOL_PATH, 'ruby', 'bin', 'ruby.exe')}\" \"#{File.join(TOOL_PATH, 'six-downloader.rb')}\""
+    else
+      "\"#{File.join(TOOL_PATH, 'six-downloader.exe')}\""
+    end
+
     LOG_LIMIT = 9999
     # TODO: Allow downloader yml instead?
     # TODO: Auto update always etc? :D
@@ -154,7 +160,7 @@ module Six
       rescue
         log.warn "7-zip not found, attempting download!"
         log.debug "#{$!}"
-        system "six-downloader.exe \"#{File.join(BASE_PATH, 'six-downloader_7z.yml').gsub('/', '\\')}\" --output \"#{TOOL_PATH.gsub('/', '\\')}\""
+        system "#{DOWNLOADER} \"#{File.join(BASE_PATH, 'six-downloader_7z.yml').gsub('/', '\\')}\" --output \"#{TOOL_PATH.gsub('/', '\\')}\""
         file = File.join(TOOL_PATH, "7z.exe")
         unless FileTest.exist?(file)
           log.error "ERROR: #{file} not found, please download from http://7-zip.org/download.html '7-Zip Command Line Version'"
@@ -267,7 +273,7 @@ module Six
               Dir.chdir TOOL_PATH
               file = "portablegit.7z"
               FileUtils.rm_f file if FileTest.exist?(file)
-              system "six-downloader.exe \"#{File.join(BASE_PATH, 'six-downloader_portablegit.yml').gsub('/', '\\')}\" --output \"#{TOOL_PATH.gsub('/', '\\')}\""
+              system "#{DOWNLOADER} \"#{File.join(BASE_PATH, 'six-downloader_portablegit.yml').gsub('/', '\\')}\" --output \"#{TOOL_PATH.gsub('/', '\\')}\""
               dir = File.join(TOOL_PATH, 'Git')
               FileUtils.rm_rf dir if FileTest.exist?(dir)
               FileUtils.mkdir_p dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 01:00:00 +02:00
+date: 2009-10-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency