Merge branch 'Void-0.3.6' into devel

lib/auth.rb

@@ -10,7 +10,7 @@ def initialize
   end
 
   def mkdir(path)
-    return unless File.exist?(path)
+    return if File.exist?(path)
 
     x("mkdir -p #{path}")
   end

lib/spior/iptables/rules.rb

@@ -43,6 +43,8 @@ def insert_comment(spior_file, iptable_file)
       end
 
       def search_for_comment(filename)
+        return unless File.exist? filename
+
         File.open(filename) do |f|
           f.each do |line|
             return true if line.match(/saved by Spior/)
@@ -88,7 +90,7 @@ def restoring_older_rules(filename)
 
       def search_iptables_config
         case Nomansland.distro?
-        when :archlinux || :void
+        when :archlinux && :void
           '/etc/iptables/iptables.rules'
         when :debian
           '/etc/iptables.up.rules'

lib/spior/tor/config.rb

@@ -106,7 +106,7 @@ def adding(content, option)
       end
 
       def digest_match?(src, dest)
-        return unless File.exist?(dest)
+        return unless File.exist?(dest) && File.readable?(dest)
 
         md5_src = Digest::MD5.file src
         md5_dest = Digest::MD5.file dest

lib/spior/tor/data.rb

@@ -34,7 +34,8 @@ def initialize
       def search(option_name)
         File.open('/etc/tor/torrc') do |f|
           f.each do |line|
-            return Regexp.last_match(1) if line.match(%r{#{option_name} ([a-z0-9./]*)}i)
+            line.match(%r{^#{option_name} ([a-z0-9./]*)}i) and
+              return Regexp.last_match(1)
           end
         end
         false

lib/spior/tor/stop.rb

@@ -7,13 +7,6 @@ module Tor
     # It also kill previous instance run by Spior
     class Stop
       def initialize
-        old_pid = `pgrep -f "tor -f /tmp/torrc*"`.chomp
-
-        if old_pid != ''
-          Msg.p "Found old pid > #{old_pid}, killing it..."
-          Helpers::Exec.new('kill').run("-9 #{old_pid}")
-        end
-
         nomansland
       end