Skip to content

Commit 1c00a37

Browse files
authored
Merge pull request #403 from OCSInventory-NG/updatemacos2.9.1
Update macos 2.9.1
2 parents 01ebdca + 37efa6f commit 1c00a37

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

lib/Ocsinventory/Agent/Backend/OS/MacOS/Mem.pm

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ sub run {
5252
my $size = $memory->{'dimm_size'};
5353

5454
my $desc = $memory->{'dimm_part_number'};
55-
if ($desc !~ /empty/) {
55+
56+
if ($desc !~ /empty/ && $desc =~ s/^0x//) {
5657
# dimm_part_number is an hex string, convert it to ascii
5758
$desc =~ s/^0x//;
5859
$desc = pack "H*", $desc;

macosx/ocsinventory_packages_setup/OCS Inventory Pkg Setup.pkgproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@
501501
<key>USE_HFS+_COMPRESSION</key>
502502
<false/>
503503
<key>VERSION</key>
504-
<string>2.9</string>
504+
<string>2.9.1</string>
505505
</dict>
506506
<key>TYPE</key>
507507
<integer>0</integer>

macosx/ocsng_app-xcode/OCSNG.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
CODE_SIGN_IDENTITY = "Apple Development";
375375
CODE_SIGN_STYLE = Automatic;
376376
COPY_PHASE_STRIP = NO;
377-
CURRENT_PROJECT_VERSION = 2.9.0;
377+
CURRENT_PROJECT_VERSION = 2.9.1;
378378
DEVELOPMENT_TEAM = 325U55CH79;
379379
ENABLE_HARDENED_RUNTIME = YES;
380380
GCC_DYNAMIC_NO_PIC = NO;
@@ -386,7 +386,7 @@
386386
INFOPLIST_FILE = Info.plist;
387387
INSTALL_PATH = "$(HOME)/Applications";
388388
MACOSX_DEPLOYMENT_TARGET = 10.12;
389-
MARKETING_VERSION = 2.9;
389+
MARKETING_VERSION = 2.9.1;
390390
OBJROOT = build;
391391
ONLY_ACTIVE_ARCH = NO;
392392
PRODUCT_BUNDLE_IDENTIFIER = org.ocsng.agent;
@@ -406,7 +406,7 @@
406406
CLANG_ENABLE_OBJC_WEAK = YES;
407407
CODE_SIGN_IDENTITY = "Apple Development";
408408
CODE_SIGN_STYLE = Automatic;
409-
CURRENT_PROJECT_VERSION = 2.9.0;
409+
CURRENT_PROJECT_VERSION = 2.9.1;
410410
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
411411
DEVELOPMENT_TEAM = 325U55CH79;
412412
ENABLE_HARDENED_RUNTIME = YES;
@@ -416,7 +416,7 @@
416416
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
417417
INFOPLIST_FILE = Info.plist;
418418
MACOSX_DEPLOYMENT_TARGET = 10.12;
419-
MARKETING_VERSION = 2.9;
419+
MARKETING_VERSION = 2.9.1;
420420
OBJROOT = build;
421421
ONLY_ACTIVE_ARCH = YES;
422422
PRODUCT_BUNDLE_IDENTIFIER = org.ocsng.agent;

0 commit comments

Comments
 (0)