System : better OS name detectionmaster

1 files changed, 6 insertions, 3 deletions

diff --git a/libs/system.php b/libs/system.php
index 5aea939..702ef3b 100644
--- a/libs/system.php
+++ b/libs/system.php
@@ -8,11 +8,14 @@ $hostname = php_uname('n');
 // OS
 if (!($os = shell_exec('/usr/bin/lsb_release -ds | cut -d= -f2 | tr -d \'"\'')))
 {
-    if(!($os = shell_exec('cat /etc/system-release | cut -d= -f2 | tr -d \'"\''))) 
+    if (!($os = shell_exec('cat /etc/system-release | cut -d= -f2 | tr -d \'"\'')))
     {
-        if (!($os = shell_exec('find /etc/*-release -type f -exec cat {} \; | grep PRETTY_NAME | tail -n 1 | cut -d= -f2 | tr -d \'"\'')))
+        if (!($os = shell_exec('cat /etc/os-release | grep PRETTY_NAME | tail -n 1 | cut -d= -f2 | tr -d \'"\'')))
         {
-            $os = 'N.A';
+            if (!($os = shell_exec('find /etc/*-release -type f -exec cat {} \; | grep PRETTY_NAME | tail -n 1 | cut -d= -f2 | tr -d \'"\'')))
+            {
+                $os = 'N.A';
+            }
         }
     }
 }