Detect correct linux version for Debian, make detection of linux versions more relax2.0.4-b2

3 files changed, 19 insertions, 4 deletions

diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
index 70c284e655..4993e668ee 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml
@@ -48,7 +48,7 @@
   version: '$2'
   
   
-- regex: '((?:Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs|Presto));.*Linux'
+- regex: '((?:Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs))'
   name: '$1'
   version: ''
   
diff --git a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
index f4887813cf..d101436a01 100644
--- a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
+++ b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
@@ -1,5 +1,20 @@
----
-- 
+-
+  user_agent: Mozilla/5.0 (X11; Intel Mac OS X) AppleWebKit/538.1 (KHTML, like Gecko) Safari/538.1 Debian/unstable (3.8.2-5) Epiphany/3.8.2
+  os:
+    name: Debian
+    short_name: DEB
+    version:
+  browser:
+    name: Epiphany
+    short_name: EP
+    version: 3.8
+  device:
+    type: desktop
+    brand:
+    model:
+  os_family: Linux
+  browser_family: Unknown
+-
   user_agent: Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko
   os:
     name: Windows 7
diff --git a/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php b/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php
index bca2a50de5..0fbf135867 100644
--- a/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php
+++ b/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php
@@ -20,7 +20,7 @@ class UserAgentParserEnhancedTest extends PHPUnit_Framework_TestCase
             $processed = Spyc::YAMLDump($parsed, false, $wordWrap = 0);
             $processedPath = $fixturesPath . '.new';
             file_put_contents($processedPath, $processed);
-            $diffCommand = "diff";
+            $diffCommand = "diff -a1 -b1";
             $command = "{$diffCommand} $fixturesPath $processedPath";
             echo $command . "\n";
             echo shell_exec($command);