Fixed to make the command portable on BSD/Solaris.

This commit is contained in:
Loic d'Anterroches 2009-06-19 21:37:39 +02:00
parent d6c0b7a680
commit 6cf4f00f92
4 changed files with 10 additions and 10 deletions

View File

@ -43,10 +43,10 @@ class IDF_Scm_Git extends IDF_Scm
public function getRepositorySize() public function getRepositorySize()
{ {
$cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs ' $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '
.escapeshellarg($this->repo); .escapeshellarg($this->repo);
$out = split(' ', shell_exec($cmd), 2); $out = split(' ', shell_exec($cmd), 2);
return (int) $out[0]; return (int) $out[0]*1024;
} }
public function isAvailable() public function isAvailable()

View File

@ -35,10 +35,10 @@ class IDF_Scm_Mercurial extends IDF_Scm
public function getRepositorySize() public function getRepositorySize()
{ {
$cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs ' $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '
.escapeshellarg($this->repo); .escapeshellarg($this->repo);
$out = split(' ', shell_exec($cmd), 2); $out = split(' ', shell_exec($cmd), 2);
return (int) $out[0]; return (int) $out[0]*1024;
} }
public static function factory($project) public static function factory($project)

View File

@ -56,10 +56,10 @@ class IDF_Scm_Svn extends IDF_Scm
if (strpos($this->repo, 'file://') !== 0) { if (strpos($this->repo, 'file://') !== 0) {
return -1; return -1;
} }
$cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs ' $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '
.escapeshellarg(substr($this->repo, 7)); .escapeshellarg(substr($this->repo, 7));
$out = split(' ', shell_exec($cmd), 2); $out = split(' ', shell_exec($cmd), 2);
return (int) $out[0]; return (int) $out[0]*1024;
} }
/** /**

View File

@ -319,14 +319,14 @@ function IDF_Views_Admin_getForgeSize()
$res['repositories'] += $size; $res['repositories'] += $size;
} }
} }
$cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs ' $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '
.escapeshellarg(Pluf::f('upload_path')); .escapeshellarg(Pluf::f('upload_path'));
$out = split(' ', shell_exec($cmd), 2); $out = split(' ', shell_exec($cmd), 2);
$res['downloads'] = $out[0]; $res['downloads'] = $out[0]*1024;
$cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs ' $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '
.escapeshellarg(Pluf::f('upload_issue_path')); .escapeshellarg(Pluf::f('upload_issue_path'));
$out = split(' ', shell_exec($cmd), 2); $out = split(' ', shell_exec($cmd), 2);
$res['attachments'] = $out[0]; $res['attachments'] = $out[0]*1024;
$res['total'] = $res['repositories'] + $res['downloads'] + $res['attachments']; $res['total'] = $res['repositories'] + $res['downloads'] + $res['attachments'];
// TODO: now we need the db // TODO: now we need the db
return $res; return $res;