Skip to content

Commit ffd66d2

Browse files
committed
fix: Update MacOSX system_profiler output parsing for softwares inventory
1 parent 937c0ce commit ffd66d2

File tree

3 files changed

+6300
-3
lines changed

3 files changed

+6300
-3
lines changed

lib/GLPI/Agent/Task/Inventory/MacOS/Softwares.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ sub _getSoftwaresList {
5555
$app->{'Get Info String'} =~ /^\S+, [A-Z]:\\/;
5656

5757
my $version = $app->{'Version'};
58+
# Cleanup dotted version from spaces
59+
$version =~ s/ \. /./g unless empty($version);
5860
my $soft = {
5961
NAME => $name,
6062
VERSION => $version,
@@ -77,10 +79,10 @@ sub _getSoftwaresList {
7779
if (grep { /\bApple\b/i } @publisher) {
7880
$publisher = 'Apple';
7981
} else {
80-
($publisher) = grep { /(\(C\)|\x{a9}|Copyright)/i } @publisher;
82+
($publisher) = grep { /(\(C\)|\x{a9}|Copyright|\x{ef}\x{bf}\x{bd})/i } @publisher;
8183
unless (empty($publisher)) {
8284
$publisher = $1 if $publisher =~ /\sby\s(.*)/i;
83-
$publisher =~ s/.*(\(C\)|\x{a9}|Copyright)\s*//gi;
85+
$publisher =~ s/.*(\(C\)|\x{a9}|Copyright|\x{ef}\x{bf}\x{bd})\s*//gi;
8486
$publisher =~ s/\s*All rights reserved\.?\s*//i;
8587
$publisher =~ s/\s*Incorporated.*/ Inc./i;
8688
$publisher =~ s/\s*Corporation.*//i;

0 commit comments

Comments
 (0)