From f5daecadf5846ff0b2d512e6a1a47f17342fe02b Mon Sep 17 00:00:00 2001
From: Uwe Merbeth <uwe.merbeth@gmail.com>
Date: Mon, 09 May 2016 15:04:28 -0400
Subject: [PATCH] detect the ubuntu version based on /etc/os-release
---
install/lib/install.lib.php | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index f17b982..ae17a72 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -66,8 +66,28 @@
$distid = '';
$distbaseid = '';
- //** Debian or Ubuntu
- if(file_exists('/etc/debian_version')) {
+ //** Debian or Ubuntu
+ if (is_file('/etc/os-release') && stristr(file_get_contents('/etc/os-release'), 'Ubuntu')) {
+ $os_release = file_get_contents('/etc/os-release');
+ if (strstr(trim($os_release), 'LTS')) {
+ $lts = " LTS";
+ } else {
+ $lts = "";
+ }
+
+ preg_match("/.*VERSION=\"(.*)\".*/ui", $os_release, $ver);
+ $ver = str_replace("LTS", "", $ver[1]);
+ $ver = explode(" ", $ver, 2);
+ $relname = end($ver);
+ $relname = "(" . trim(trim($relname), "()") . ")";
+ $distname = 'Ubuntu';
+ $ver = reset($ver);
+ $distid = 'debian40';
+ $distbaseid = 'debian';
+ $distver = $ver . $lts . " " . $relname;
+ swriteln("Operating System: " . $distver . "\n");
+ } //** Debian / Ubuntu
+ elseif(file_exists('/etc/debian_version')) {
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
$lts=" LTS";
@@ -86,6 +106,13 @@
$mainver = array_filter($mainver);
$mainver = current($mainver).'.'.next($mainver);
switch ($mainver){
+ case "16.04":
+ $relname = "(Xenial Xerus)";
+ $distid = 'ubuntu1604';
+ break;
+ case "15.10":
+ $relname = "(Wily Werewolf)";
+ break;
case "15.04":
$relname = "(Vivid Vervet)";
break;
--
Gitblit v1.9.1