six-updater 0.10.11 → 0.11.2

data/Rakefile

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

data/lib/six/updater-app.rb

@@ -6,9 +6,15 @@ module Six
   module Updater
     PID_FILE = File.join(BASE_PATH, "#{COMPONENT}.pid")
     if not defined?(Ocra)
+      #Signal.trap("EXIT") { exit_app }
+      #Signal.trap("INT") { exit_app }
+      #Signal.trap("TERM") { exit_app }
+      #Signal.trap("KILL") { exit_app }
+
       if File.exist?(PID_FILE)
         log.error "The program seems to be already running. Please wait/close the other application first."
         log.info "If you believe this is in error, please delete #{PID_FILE}"
+        log.info "If the file doesn't exist, you are probably NOT running this software 'As Administrator'"
         sleep 15
         Process.exit
       end

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.11'
+    VERSION = '0.11.2'
     COMPONENT = 'six-updater'
 
     # Configuration
@@ -90,7 +90,7 @@ module Six
     bpath.gsub!('/', '\\')
     tpath = "#{File.join(bpath, 'tools')};#{File.join(bpath, 'tools', 'bin')}"
     tpath.gsub!('/', '\\')
-    ENV['PATH'] = "#{ENV['PATH']};#{bpath};#{tpath}"
+    ENV['PATH'] = "#{bpath};#{tpath};#{ENV['PATH']}"
 
     # Create config hash with default settings
     @config = Hash.new
@@ -145,6 +145,11 @@ module Six
       @@log
     end
 
+    def exit_app
+      FileUtils.rm_f PID_FILE
+      exit
+    end
+
     def wait
       STDIN.gets
     end
@@ -292,7 +297,7 @@ module Six
         unless @config[:git_path] == 'PATH'
           path = @config[:git_path].clone
           path.gsub!('/','\\')
-          ENV['PATH'] = "#{ENV['PATH']};#{path}" if path.size > 0 #unless ENV['PATH'][/git/] # ??
+          ENV['PATH'] = "#{path};#{ENV['PATH']}" if path.size > 0 #unless ENV['PATH'][/git/] # ??
         end
 
         log.info "Using Git at: #{@config[:git_path]}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  version: 0.10.11
+  version: 0.11.2
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +01:00
+date: 2009-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency