Merge remote-tracking branch 'gt/main'

This commit is contained in:
Chenx221 2024-04-13 18:19:38 +08:00
commit d94444d7f6
Signed by: chenx221
GPG Key ID: D7A9EC07024C3021

View File

@ -319,7 +319,7 @@ class SystemInfoHelper
$this->mp_used = FileSizeHelper::formatBytes($mp_size - $mp_avail);
$this->mp_usage = round(($mp_used / $mp_size) * 100, 2);
} else {
$this->dataMountPoint = shell_exec("df -P \"" . $dataPath . "\" | awk 'NR==2{print $6}'");
$this->dataMountPoint = trim(shell_exec("df -P \"" . $dataPath . "\" | awk 'NR==2{print $6}'"));
$this->mp_fs = shell_exec("df -T \"" . $this->dataMountPoint . "\" | awk 'NR==2{print $2}'");
$this->mp_size = FileSizeHelper::formatBytes(intval(shell_exec('df -k "' . $this->dataMountPoint . '" | awk \'NR==2{print $2}\'')));
$mp_used = intval(shell_exec('df -k "' . $this->dataMountPoint . '" | awk \'NR==2{print $3}\''));