From 8582802c77a4ea77b483189a90a86d2e5406a262 Mon Sep 17 00:00:00 2001 From: megan_w Date: Fri, 25 Apr 2008 06:23:12 +0000 Subject: [PATCH] KTS-3314 "Disk usage dashlet doesn't work on Mac OS X" Fixed. The -B parameter doesn't exist for df on the mac, changed it to use -k (kB) and multiply by 1024. --- plugins/housekeeper/DiskUsageDashlet.inc.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/housekeeper/DiskUsageDashlet.inc.php b/plugins/housekeeper/DiskUsageDashlet.inc.php index 484f7d5..32f7e56 100755 --- a/plugins/housekeeper/DiskUsageDashlet.inc.php +++ b/plugins/housekeeper/DiskUsageDashlet.inc.php @@ -104,7 +104,11 @@ class DiskUsageDashlet extends KTBaseDashlet } else { - $result = shell_exec($cmd." -B 1 2>&1"); + if(strtolower(PHP_OS) == 'darwin'){ + $result = shell_exec($cmd." -k 2>&1"); + }else{ + $result = shell_exec($cmd." -B 1 2>&1"); + } } if (strpos($result, 'cannot read table of mounted file systems') !== false) @@ -127,6 +131,12 @@ class DiskUsageDashlet extends KTBaseDashlet if ($size === 0) continue; + if(strtolower(PHP_OS) == 'darwin'){ + $size = $size * 1024; + $used = $used * 1024; + $avail = $avail * 1024; + } + $colour = ''; if ($usedp >= 100 - $this->urgentPercent) { -- libgit2 0.21.4