Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5

Marius Cramer

2014-08-13 42539643c396f9d8865dcf9a51b13dc869709d16

 install/lib/install.lib.php

@@ -86,6 +86,15 @@
         $mainver = array_filter($mainver);
         $mainver = current($mainver).'.'.next($mainver);
         switch ($mainver){
         case "14.04":
            $relname = "(Trusty Tahr)";
            break;
         case "13.10":
            $relname = "(Saucy Salamander)";
            break;
         case "13.04":
            $relname = "(Raring Ringtail)";
            break;
         case "12.10":
            $relname = "(Quantal Quetzal)";
            break;
@@ -246,6 +255,18 @@
         $distid = 'centos53';
         $distbaseid = 'fedora';
         swriteln("Operating System: CentOS 5 or compatible\n");
      } elseif(stristr($content, 'CentOS Linux release 6')) {
         $distname = 'CentOS';
         $distver = 'Unknown';
         $distid = 'centos53';
         $distbaseid = 'fedora';
         swriteln("Operating System: CentOS 6 or compatible\n");
      } elseif(stristr($content, 'CentOS Linux release 7')) {
         $distname = 'CentOS';
         $distver = 'Unknown';
         $distid = 'centos53';
         $distbaseid = 'fedora';
         swriteln("Operating System: CentOS 7 or compatible\n");
      } else {
         $distname = 'Redhat';
         $distver = 'Unknown';