git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix git version detection on OSX
[phorkie.git]
/
src
/
phorkie
/
SetupCheck.php
diff --git
a/src/phorkie/SetupCheck.php
b/src/phorkie/SetupCheck.php
index 177a0f75d8c98ffd32b9b328de0807671a3ca134..c4d365c7a79552166aea7e88413f44ef0087f821 100644
(file)
--- a/
src/phorkie/SetupCheck.php
+++ b/
src/phorkie/SetupCheck.php
@@
-18,12
+18,14
@@
class SetupCheck
protected $writableDirs;
protected $elasticsearch;
protected $writableDirs;
protected $elasticsearch;
+ public $messages = array();
+
public function __construct()
{
$cfg = $GLOBALS['phorkie']['cfg'];
$this->writableDirs = array(
public function __construct()
{
$cfg = $GLOBALS['phorkie']['cfg'];
$this->writableDirs = array(
- 'gitdir'
=> $cfg['gitdir']
,
- 'workdir' =>
$cfg['workdir']
,
+ 'gitdir'
=> Tools::foldPath($cfg['gitdir'])
,
+ 'workdir' =>
Tools::foldPath($cfg['workdir'])
,
);
$this->elasticsearch = $cfg['elasticsearch'];
}
);
$this->elasticsearch = $cfg['elasticsearch'];
}
@@
-31,11
+33,29
@@
class SetupCheck
public static function run()
{
$sc = new self();
public static function run()
{
$sc = new self();
+ $sc->checkConfigFiles();
$sc->checkDeps();
$sc->checkDirs();
$sc->checkGit();
$sc->checkDatabase();
$sc->checkMimeTypeDetection();
$sc->checkDeps();
$sc->checkDirs();
$sc->checkGit();
$sc->checkDatabase();
$sc->checkMimeTypeDetection();
+ $sc->checkRemoteForking();
+
+ return $sc->messages;
+ }
+
+ public function checkConfigFiles()
+ {
+ foreach ($GLOBALS['phorkie']['cfgfiles'] as $file => $loaded) {
+ if ($loaded) {
+ $this->ok('Loaded config file: ' . Tools::foldPath($file));
+ } else {
+ $this->info(
+ 'Possible config file: ' . Tools::foldPath($file)
+ . ' (not loaded)'
+ );
+ }
+ }
}
public function checkDeps()
}
public function checkDeps()
@@
-69,8
+89,7
@@
class SetupCheck
foreach ($this->writableDirs as $name => $dir) {
if (!is_dir($dir)) {
$this->fail($name . ' directory does not exist at ' . $dir);
foreach ($this->writableDirs as $name => $dir) {
if (!is_dir($dir)) {
$this->fail($name . ' directory does not exist at ' . $dir);
- }
- if (!is_writable($dir)) {
+ } else if (!is_writable($dir)) {
$this->fail($name . ' directory is not writable at ' . $dir);
}
}
$this->fail($name . ' directory is not writable at ' . $dir);
}
}
@@
-82,8
+101,9
@@
class SetupCheck
if ($retval !== 0) {
$this->fail('Running git executable failed.');
}
if ($retval !== 0) {
$this->fail('Running git executable failed.');
}
- if (!preg_match('#^git version ([0-9.]+(rc[0-9]+)?)$#', $line, $matches)) {
+ if (!preg_match('#^git version ([0-9.]+(rc[0-9]+)?)
(?: \(Apple Git-\d+\))?
$#', $line, $matches)) {
$this->fail('git version output format unexpected: ' . $line);
$this->fail('git version output format unexpected: ' . $line);
+ return;
}
if (version_compare($matches[1], '1.7.5') < 0) {
$this->fail(
}
if (version_compare($matches[1], '1.7.5') < 0) {
$this->fail(
@@
-118,9
+138,31
@@
class SetupCheck
}
}
}
}
+ public function checkRemoteForking()
+ {
+ if (!isset($GLOBALS['phorkie']['cfg']['git']['public'])
+ || $GLOBALS['phorkie']['cfg']['git']['public'] == ''
+ ) {
+ $this->fail(
+ 'No public git URL prefix configured.'
+ . ' Remote forking will not work'
+ );
+ }
+ }
+
public function fail($msg)
{
public function fail($msg)
{
- throw new Exception($msg);
+ $this->messages[] = array('error', $msg);
+ }
+
+ public function info($msg)
+ {
+ $this->messages[] = array('info', $msg);
+ }
+
+ public function ok($msg)
+ {
+ $this->messages[] = array('ok', $msg);
}
}
}
}