Merge pull request #1 from wpscanteam/master

Update from master
2013-11-12 23:12:20 -08:00
parent d4758bd22f 16c7edb0f1
commit 32e597f6a4
2 changed files with 7 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog

 ## Version 2.2 
-Released: yyyy-m-d
+Released: 2013-11-12

 Added
 * Output the vulnerability fix if available
--- a/lib/common/common_helper.rb
+++ b/lib/common/common_helper.rb
@@ -33,14 +33,18 @@ VULNS_XSD           = DATA_DIR + '/vuln.xsd'
 WP_VERSIONS_XSD     = DATA_DIR + '/wp_versions.xsd'
 LOCAL_FILES_XSD     = DATA_DIR + '/local_vulnerable_files.xsd'

-WPSCAN_VERSION       = '2.1'
+WPSCAN_VERSION       = '2.2'

 $LOAD_PATH.unshift(LIB_DIR)
 $LOAD_PATH.unshift(WPSCAN_LIB_DIR)
 $LOAD_PATH.unshift(MODELS_LIB_DIR)

 def kali_linux?
-  %x{uname -a} =~ /kali/i
+  begin
+    File.readlines("/etc/debian_version").grep(/^kali/i).any?
+  rescue
+    false
+  end
 end

 require 'environment'