Merge pull request #1077 from RotherOSS/issue-#997-darwin

Issue #997 darwin
RotherOSS · Jun 10, 2021 · 79f1c28 · 79f1c28
2 parents 80f7223 + 3d9722e
commit 79f1c28
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 49 deletions.
diff --git a/Kernel/System/Environment.pm b/Kernel/System/Environment.pm
@@ -95,7 +95,6 @@ sub OSInfoGet {
         linux   => 'Linux',
         freebsd => 'FreeBSD',
         openbsd => 'OpenBSD',
-        darwin  => 'MacOSX',
     );
 
     # If used OS is a linux system
@@ -130,13 +129,6 @@ sub OSInfoGet {
             }
         }
     }
-    elsif ( $^O eq 'darwin' ) {
-
-        my $MacVersion = `sw_vers -productVersion` || '';
-        chomp $MacVersion;
-
-        $OSName = 'MacOSX ' . $MacVersion;
-    }
     elsif ( $^O eq 'freebsd' || $^O eq 'openbsd' ) {
 
         my $BSDVersion = `uname -r` || '';

diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/DiskPartitionOTOBO.pm b/Kernel/System/SupportDataCollector/Plugin/OS/DiskPartitionOTOBO.pm
@@ -34,10 +34,8 @@ sub GetDisplayPath {
 sub Run {
     my $Self = shift;
 
-    # Check if used OS is a linux system
-    if ( $^O !~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
-        return $Self->GetResults();
-    }
+    # Check if used OS is a supported system. See https://perldoc.perl.org/perlport#PLATFORMS.
+    return $Self->GetResults() unless $^O =~ m/(linux|unix|netbsd|freebsd)/i;
 
     # find OTOBO partition
     my $Home = $Kernel::OM->Get('Kernel::Config')->Get('Home');

diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/DiskSpace.pm b/Kernel/System/SupportDataCollector/Plugin/OS/DiskSpace.pm
@@ -36,14 +36,12 @@ sub Run {
 
     # This plugin is temporary disabled
     # A new logic is required to calculate the space
-    # TODO: fix
+    # TODO: see https://github.com/RotherOSS/otobo/issues/1076
     return $Self->GetResults();
 
-    # # Check if used OS is a linux system
-    # if ( $^O !~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
-    #     return $Self->GetResults();
-    # }
-    #
+    ## Check if used OS is a supported system. See https://perldoc.perl.org/perlport#PLATFORMS.
+    #return $Self->GetResults() unless $^O =~ m/(linux|unix|netbsd|freebsd)/i;
+
     # # find OTOBO partition
     # my $Home = $Kernel::OM->Get('Kernel::Config')->Get('Home');
     #

diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/DiskSpacePartitions.pm b/Kernel/System/SupportDataCollector/Plugin/OS/DiskSpacePartitions.pm
@@ -32,15 +32,13 @@ sub GetDisplayPath {
 sub Run {
     my $Self = shift;
 
-    # Check if used OS is a Linux system
-    if ( $^O !~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
-        return $Self->GetResults();
-    }
+    # Check if used OS is a supported system. See https://perldoc.perl.org/perlport#PLATFORMS.
+    return $Self->GetResults() unless $^O =~ m/(linux|unix|netbsd|freebsd)/i;
 
     my $Commandline = "df -lHx tmpfs -x iso9660 -x udf -x squashfs";
 
-    # current MacOS and FreeBSD does not support the -x flag for df
-    if ( $^O =~ /(darwin|freebsd)/i ) {
+    # currently FreeBSD does not support the -x flag for df
+    if ( $^O =~ /(freebsd)/i ) {
         $Commandline = "df -lH";
     }
 

diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/KernelVersion.pm b/Kernel/System/SupportDataCollector/Plugin/OS/KernelVersion.pm
@@ -32,10 +32,8 @@ sub GetDisplayPath {
 sub Run {
     my $Self = shift;
 
-    # Check if used OS is a linux system
-    if ( $^O !~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
-        return $Self->GetResults();
-    }
+    # Check if used OS is a supported system. See https://perldoc.perl.org/perlport#PLATFORMS.
+    return $Self->GetResults() unless $^O =~ m/(linux|unix|netbsd|freebsd)/i;
 
     my $KernelVersion = "";
     my $KernelInfo;

diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/Load.pm b/Kernel/System/SupportDataCollector/Plugin/OS/Load.pm
@@ -32,15 +32,13 @@ sub GetDisplayPath {
 sub Run {
     my $Self = shift;
 
-    # Check if used OS is a linux system
-    if ( $^O !~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
-        return $Self->GetResults();
-    }
+    # Check if used OS is a supported system. See https://perldoc.perl.org/perlport#PLATFORMS.
+    return $Self->GetResults() unless $^O =~ m/(linux|unix|netbsd|freebsd)/i;
 
     my @Loads;
 
     # If used OS is a linux system
-    if ( $^O =~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
+    if ( $^O =~ /(linux|unix|netbsd|freebsd)/i ) {
 
         # linux systems
         if ( -e '/proc/loadavg' ) {
@@ -50,18 +48,6 @@ sub Run {
             }
         }
 
-        # mac os
-        elsif ( $^O =~ /darwin/i ) {
-            if ( open( my $In, '-|', "sysctl vm.loadavg" ) ) {    ## no critic qw(OTOBO::ProhibitOpen InputOutput::RequireBriefOpen)
-                while (<$In>) {
-                    if ( my ($Loads) = $_ =~ /vm\.loadavg: \s* \{ \s*  (.*) \s* \}/smx ) {
-                        @Loads = split ' ', $Loads;
-                    }
-                }
-                close $In;
-            }
-        }
-
         if (@Loads) {
             $Self->AddResultInformation(
                 Label   => Translatable('System Load'),

diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/Swap.pm b/Kernel/System/SupportDataCollector/Plugin/OS/Swap.pm
@@ -32,10 +32,8 @@ sub GetDisplayPath {
 sub Run {
     my $Self = shift;
 
-    # Check if used OS is a linux system
-    if ( $^O !~ /(linux|unix|netbsd|freebsd|darwin)/i ) {
-        return $Self->GetResults();
-    }
+    # Check if used OS is a supported system. See https://perldoc.perl.org/perlport#PLATFORMS.
+    return $Self->GetResults() unless $^O =~ m/(linux|unix|netbsd|freebsd)/i;
 
     my $MemInfoFile;
     my ( $MemTotal, $MemFree, $SwapTotal, $SwapFree );