From 2b1e46f91f1a859b296142b518aeacd4f1fdc40e Mon Sep 17 00:00:00 2001
From: rcassani <raymundo.cassani@gmail.com>
Date: Tue, 17 Sep 2024 14:06:49 -0400
Subject: [PATCH] GUI: Update get and display of system info

---
 toolbox/core/bst_get.m        | 19 ++++++++++++-------
 toolbox/core/bst_systeminfo.m | 30 +++++++++++++++---------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/toolbox/core/bst_get.m b/toolbox/core/bst_get.m
index 4f0248a0b..99a89edb5 100644
--- a/toolbox/core/bst_get.m
+++ b/toolbox/core/bst_get.m
@@ -569,17 +569,22 @@
         end
         switch osFamily
             case 'win'
-                [~, system_info] = system('systeminfo');
-                osName = regexp(system_info, '(?<=OS Name:)(.*?)(?=\n)', 'match');
-                osName = strtrim(osName{1});
-                osVer = regexp(system_info, '(?<=OS Version:)(.*?)(?=\n)', 'match');
-                osVer = strtrim(osVer{1});
-                argout1 = [osName, ' (', osVer, ')'];
+                [~, system_info] = system('ver');
+                argout1 = strtrim(system_info);
 
             case 'linux'
                 os_release = fileread('/etc/os-release');
                 osName = regexp(os_release, '(?<=PRETTY_NAME=")(.*?)(?=")', 'match');
-                osName = strtrim(osName{1});
+                if ~isempty(osName)
+                    osName = strtrim(osName{1});
+                else
+                    osName = regexp(os_release, '(?<=NAME=")(.*?)(?=")', 'match');
+                    if ~isempty(osName)
+                        osName = strtrim(osName{1});
+                    else
+                        osName = 'Linux unknow distribution';
+                    end
+                end
                 [~, kernelVer] = system('uname -r');
                 kernelVer = strtrim(kernelVer);
                 argout1 = [osName, ' (' kernelVer, ')'];
diff --git a/toolbox/core/bst_systeminfo.m b/toolbox/core/bst_systeminfo.m
index 2668ccf22..df6dbd7bc 100644
--- a/toolbox/core/bst_systeminfo.m
+++ b/toolbox/core/bst_systeminfo.m
@@ -37,17 +37,17 @@
 summaryPairs = [summaryPairs; {'=== Brainstorm ===', ''}];
 % Version
 bst_version = bst_get('Version');
-summaryPairs = [summaryPairs; {'Version', bst_version.Version}];
-summaryPairs = [summaryPairs; {'Release', bst_version.Release}];
-bst_variant = 'souce';
+summaryPairs = [summaryPairs; {'Version ', bst_version.Version}];
+summaryPairs = [summaryPairs; {'Release ', bst_version.Release}];
+bst_variant  = 'source';
 if bst_iscompiled()
     bst_variant = 'standalone';
 end
-summaryPairs = [summaryPairs; {'Variant', bst_variant}];
+summaryPairs = [summaryPairs; {'Variant ', bst_variant}];
 % Plugins
 pluginTextPairs = cell(0,2);
-pluginTextPairs = [pluginTextPairs, {'Plugins', 'No installed plugins.'}];
-InstPlugs = bst_plugin('GetInstalled');
+pluginTextPairs = [pluginTextPairs, {'Plugins ', 'No installed plugins.'}];
+InstPlugs  = bst_plugin('GetInstalled');
 nInstPlugs = length(InstPlugs);
 iPluginRow = 0;
 for ix = 1 : nInstPlugs
@@ -68,24 +68,24 @@
 summaryPairs = [summaryPairs; {'=== Brainstorm directories ===', ''}];
 summaryPairs = [summaryPairs; {'*** Directory paths may contain sensitive information, check before sharing ***', ''}];
 summaryPairs = [summaryPairs; {'Brainstorm ', bst_get('BrainstormHomeDir')}];
-summaryPairs = [summaryPairs; {'DataBase   ',   bst_get('BrainstormDbDir')}];
-summaryPairs = [summaryPairs; {'Bst_User   ',   bst_get('BrainstormUserDir')}];
-summaryPairs = [summaryPairs; {'Temporary  ',  bst_get('BrainstormTmpDir')}];
+summaryPairs = [summaryPairs; {'DataBase   ', bst_get('BrainstormDbDir')}];
+summaryPairs = [summaryPairs; {'Bst_User   ', bst_get('BrainstormUserDir')}];
+summaryPairs = [summaryPairs; {'Temporary  ', bst_get('BrainstormTmpDir')}];
 summaryPairs = [summaryPairs; {'', ''}];
 
 % === Matlab and Java
 summaryPairs = [summaryPairs; {'=== Matlab ===', ''}];
-summaryPairs = [summaryPairs; {'Matlab version', [bst_get('MatlabReleaseName') ' (' num2str(bst_get('MatlabVersion')/100) ')']}];
-summaryPairs = [summaryPairs; {'Java version', num2str(bst_get('JavaVersion'))}];
+summaryPairs = [summaryPairs; {'Matlab version ', [bst_get('MatlabReleaseName') ' (' num2str(bst_get('MatlabVersion')/100) ')']}];
+summaryPairs = [summaryPairs; {'Java version   ', num2str(bst_get('JavaVersion'))}];
 summaryPairs = [summaryPairs; {'', ''}];
 
 % == System
 summaryPairs = [summaryPairs; {'=== System ===', ''}];
-summaryPairs = [summaryPairs; {'OS name', bst_get('OsName')}];
-summaryPairs = [summaryPairs; {'OS type', bst_get('OsType')}];
+summaryPairs = [summaryPairs; {'OS name   ', bst_get('OsName')}];
+summaryPairs = [summaryPairs; {'OS type   ', bst_get('OsType')}];
 [memTotal, memAvail] = bst_get('SystemMemory');
-summaryPairs = [summaryPairs; {'Mem total', [num2str(memTotal) ' MiB']}];
-summaryPairs = [summaryPairs; {'Mem avail', [num2str(memAvail) ' MiB']}];
+summaryPairs = [summaryPairs; {'Mem total ', [num2str(memTotal) ' MiB']}];
+summaryPairs = [summaryPairs; {'Mem avail ', [num2str(memAvail) ' MiB']}];
 
 % Format string
 iFields = find(~cellfun(@isempty, summaryPairs(:,2)));