six-updater-web 0.24.10 → 0.24.11

data/Rakefile

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

data/lib/six-updater-web/app/models/mod.rb

@@ -129,7 +129,7 @@ class Mod < ActiveRecord::Base
   end
 
   def my_path(setting)
-    return nil unless setting.real_modpath && self.real_name
+    return nil if setting.real_modpath.nil? || self.real_name.nil?
     File.join(self.real_path(setting), self.real_name).gsub("\\", "/")
   end
 
@@ -172,8 +172,8 @@ class Mod < ActiveRecord::Base
     self.update_skip
   end
 
-  def real_path(appsetting)
-    self.path ? self.path : appsetting.real_modpath
+  def real_path(setting)
+    self.path.nil? || self.path.empty? ? setting.real_modpath : self.path
   end
 
   def all_repositories

data/lib/six-updater-web/app/models/sixconfig.rb

@@ -108,7 +108,7 @@ class Sixconfig < ActiveRecord::Base
       if force
         mod.skip = false
       else
-        mod.update_version(setting.real_modpath)
+        mod.update_version(setting)
         mod.update_skip
       end
       mod.save
@@ -166,7 +166,7 @@ class Sixconfig < ActiveRecord::Base
 
   def imp(setting = Appsetting.new)
     Mod.find(:all).each do |mod|
-      mod.update_version(setting.real_path)
+      mod.update_version(setting)
       mod.save if mod.changed?
       next unless mod.installed?
       self.mods << mod unless self.mods.include?(mod)

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

@@ -24,7 +24,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.24.10"
+  VERSION = "0.24.11"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 24
-  - 10
-  version: 0.24.10
+  - 11
+  version: 0.24.11
 platform: ruby
 authors: 
 - Sickboy