Skip to content

Commit d281bb4

Browse files
author
cfoe
committed
added ubuntu version detection by MarciPain
1 parent 903de2a commit d281bb4

File tree

2 files changed

+148
-4
lines changed

2 files changed

+148
-4
lines changed

‎install/lib/install.lib.php‎

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,80 @@ function get_distname() {
6868

6969
//** Debian or Ubuntu
7070
if(file_exists('/etc/debian_version')) {
71-
72-
if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
71+
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
72+
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
73+
$lts=" LTS";
74+
}else{
75+
$lts="";
76+
}
77+
$issue=file_get_contents('/etc/issue');
78+
$distname = 'Ubuntu';
79+
$distid = 'debian40';
80+
$distbaseid = 'debian';
81+
$ver = explode(' ',$issue);
82+
$ver = array_filter($ver);
83+
$ver = next($ver);
84+
$mainver = explode('.',$ver);
85+
$mainver = array_filter($mainver);
86+
$mainver = current($mainver).'.'.next($mainver);
87+
switch ($mainver){
88+
case "12.10":
89+
$relname = "(Quantal Quetzal)";
90+
break;
91+
case "12.04":
92+
$relname = "(Precise Pangolin)";
93+
break;
94+
case "11.10":
95+
$relname = "(Oneiric Ocelot)";
96+
break;
97+
case "11.14":
98+
$relname = "(Natty Narwhal)";
99+
break;
100+
case "10.10":
101+
$relname = "(Maverick Meerkat)";
102+
break;
103+
case "10.04":
104+
$relname = "(Lucid Lynx)";
105+
break;
106+
case "9.10":
107+
$relname = "(Karmic Koala)";
108+
break;
109+
case "9.04":
110+
$relname = "(Jaunty Jackpole)";
111+
break;
112+
case "8.10":
113+
$relname = "(Intrepid Ibex)";
114+
break;
115+
case "8.04":
116+
$relname = "(Hardy Heron)";
117+
break;
118+
case "7.10":
119+
$relname = "(Gutsy Gibbon)";
120+
break;
121+
case "7.04":
122+
$relname = "(Feisty Fawn)";
123+
break;
124+
case "6.10":
125+
$relname = "(Edgy Eft)";
126+
break;
127+
case "6.06":
128+
$relname = "(Dapper Drake)";
129+
break;
130+
case "5.10":
131+
$relname = "(Breezy Badger)";
132+
break;
133+
case "5.04":
134+
$relname = "(Hoary Hedgehog)";
135+
break;
136+
case "4.10":
137+
$relname = "(Warty Warthog)";
138+
break;
139+
default:
140+
$relname = "UNKNOWN";
141+
}
142+
$distver = $ver.$lts." ".$relname;
143+
echo $distver;
144+
} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
73145
$distname = 'Debian';
74146
$distver = '4.0';
75147
$distid = 'debian40';

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,80 @@ public function get_distname() {
4444

4545
//** Debian or Ubuntu
4646
if (file_exists('/etc/debian_version')) {
47-
48-
if (trim(file_get_contents('/etc/debian_version')) == '4.0') {
47+
if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
48+
if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
49+
$lts=" LTS";
50+
}else{
51+
$lts="";
52+
}
53+
$issue=file_get_contents('/etc/issue');
54+
$distname = 'Ubuntu';
55+
$distid = 'debian40';
56+
$distbaseid = 'debian';
57+
$ver = explode(' ',$issue);
58+
$ver = array_filter($ver);
59+
$ver = next($ver);
60+
$mainver = explode('.',$ver);
61+
$mainver = array_filter($mainver);
62+
$mainver = current($mainver).'.'.next($mainver);
63+
switch ($mainver){
64+
case "12.10":
65+
$relname = "(Quantal Quetzal)";
66+
break;
67+
case "12.04":
68+
$relname = "(Precise Pangolin)";
69+
break;
70+
case "11.10":
71+
$relname = "(Oneiric Ocelot)";
72+
break;
73+
case "11.14":
74+
$relname = "(Natty Narwhal)";
75+
break;
76+
case "10.10":
77+
$relname = "(Maverick Meerkat)";
78+
break;
79+
case "10.04":
80+
$relname = "(Lucid Lynx)";
81+
break;
82+
case "9.10":
83+
$relname = "(Karmic Koala)";
84+
break;
85+
case "9.04":
86+
$relname = "(Jaunty Jackpole)";
87+
break;
88+
case "8.10":
89+
$relname = "(Intrepid Ibex)";
90+
break;
91+
case "8.04":
92+
$relname = "(Hardy Heron)";
93+
break;
94+
case "7.10":
95+
$relname = "(Gutsy Gibbon)";
96+
break;
97+
case "7.04":
98+
$relname = "(Feisty Fawn)";
99+
break;
100+
case "6.10":
101+
$relname = "(Edgy Eft)";
102+
break;
103+
case "6.06":
104+
$relname = "(Dapper Drake)";
105+
break;
106+
case "5.10":
107+
$relname = "(Breezy Badger)";
108+
break;
109+
case "5.04":
110+
$relname = "(Hoary Hedgehog)";
111+
break;
112+
case "4.10":
113+
$relname = "(Warty Warthog)";
114+
break;
115+
default:
116+
$relname = "UNKNOWN";
117+
}
118+
$distver = $ver.$lts." ".$relname;
119+
echo $distver;
120+
} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
49121
$distname = 'Debian';
50122
$distver = '4.0';
51123
$distid = 'debian40';

0 commit comments

Comments
 (0)