michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Include release in displayed version

Browse Source
This commit is contained in:
Jamie Cameron
2021-08-25 17:54:03 -07:00
parent 46f3a6685e
commit c86e9de2e5
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system-status/system_info.pl
View File

@@ -49,7 +49,9 @@ if (&show_section('host')) {
});
# Webmin version
my $webmin_version = &get_webmin_version(1);
my $webmin_version = &get_webmin_version();
my $rel = &get_webmin_version_release();
$webmin_version .= "-".$rel if ($rel);
push(@table, { 'desc' => $text{'right_webmin'},
'value' => $webmin_version });
push(@raw, { 'webmin_version' => $webmin_version });

8
web-lib-funcs.pl
View File

@@ -4126,13 +4126,7 @@ if (!$get_webmin_version) {
$get_webmin_version = &read_file_contents("$root_directory/version");
$get_webmin_version =~ s/\r|\n//g;
}
# Format dev version nicely
if ($ui_format_dev && length($get_webmin_version) == 13) {
return substr($get_webmin_version, 0, 5) . "." . substr($get_webmin_version, 5, 5 - 1) . "." . substr($get_webmin_version, 5 * 2 - 1);
}
else {
return $get_webmin_version;
}
return $get_webmin_version;
}
=head2 get_webmin_version_release

4
webmin/index.cgi
View File

@@ -6,7 +6,9 @@ use strict;
use warnings;
require './webmin-lib.pl';
our (%in, %text, %gconfig, %config);
my $ver = &get_webmin_version(1);
my $ver = &get_webmin_version();
my $rel = &get_webmin_version_release();
$ver .= "-".$rel if ($rel);
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
undef, undef, undef, &text('index_version', $ver));
my %access = &get_module_acl();