opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: add quiet option to bin/gittool.php 

If one has many plugin and templates installed via git. Then the gittool
may produce a lot of noise when running it with a command like 'pull'.

This option suppresses the output for those repository where the command
exits successfully and produces no output of its own.
This commit is contained in:
Michael Große 2017-10-13 18:28:32 +02:00
parent 1761ce9f49
commit 6c671fe365
No known key found for this signature in database
GPG Key ID: 7E31028FBFEACC79
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bin/gittool.php
View File

@ -31,6 +31,12 @@ class GitToolCLI extends DokuCLI {
true
);
$options->registerOption(
'quiet',
'If specified, show less cli boilerplate when running unknown commands',
'q'
);
$options->registerCommand(
'clone',
'Tries to install a known plugin or template (prefix with template:) via git. Uses the DokuWiki.org '.
@ -94,7 +100,7 @@ class GitToolCLI extends DokuCLI {
$this->cmd_repos();
break;
default:
$this->cmd_git($command, $options->args);
$this->cmd_git($command, $options->args, $options->getOpt('quiet'));
}
}
@ -166,7 +172,7 @@ class GitToolCLI extends DokuCLI {
* @param $cmd
* @param $arg
*/
public function cmd_git($cmd, $arg) {
public function cmd_git($cmd, $arg, $quiet) {
$repos = $this->findRepos();
$shell = array_merge(array('git', $cmd), $arg);
@ -179,15 +185,19 @@ class GitToolCLI extends DokuCLI {
continue;
}
echo "\n";
$this->info("executing $shell in $repo");
$ret = 0;
system($shell, $ret);
if($ret == 0) {
$this->success("git succeeded in $repo");
} else {
$this->error("git failed in $repo");
$output = array();
exec($shell, $output, $ret);
if (!$quiet || $output || $ret !== 0) {
echo "\n";
$this->info("executing $shell in $repo");
echo implode("\n",$output);
echo "\n";
if($ret === 0) {
$this->success("git succeeded in $repo");
} else {
$this->error("git failed in $repo");
}
}
}
}
@ -333,4 +343,4 @@ class GitToolCLI extends DokuCLI {
// Main
$cli = new GitToolCLI();
$cli->run();
$cli->run();