From d6b8fd758316868297b586fe26a46e0ed9a3a674 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Mon, 21 May 2018 13:15:25 +0300 Subject: [PATCH] Print dev version nicely When installed from repo, instead of having `1.88305210044` all over UI, let's have `1.883.0521.0044 `. --- web-lib-funcs.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl index a9e46ea95..38eb2bf52 100755 --- a/web-lib-funcs.pl +++ b/web-lib-funcs.pl @@ -3839,8 +3839,16 @@ if (!$get_webmin_version) { open(VERSION, "$root_directory/version") || return 0; ($get_webmin_version = ) =~ tr/\r|\n//d; close(VERSION); + if (length($get_webmin_version) > 6) { + $get_webmin_version_ui = substr($get_webmin_version, 0, 5) . "." . substr($get_webmin_version, 5, 5 - 1) . "." . substr($get_webmin_version, 5 * 2 - 1); + } + } +if ($main::webmin_script_type eq 'web' && $get_webmin_version_ui) { + return $get_webmin_version_ui; + } +else { + return $get_webmin_version; } -return $get_webmin_version; } =head2 get_module_acl([user], [module], [no-rbac], [no-default])