Page MenuHomestyx hydra
Files F271421

No OneTemporary
Actions

View Options

diff --git a/src/applications/config/check/PhabricatorSetupCheckPygment.php b/src/applications/config/check/PhabricatorSetupCheckPygment.php
index 64e77d23db..b1bad2a853 100644
--- a/src/applications/config/check/PhabricatorSetupCheckPygment.php
+++ b/src/applications/config/check/PhabricatorSetupCheckPygment.php
@@ -1,31 +1,52 @@
<?php
final class PhabricatorSetupCheckPygment extends PhabricatorSetupCheck {
protected function executeChecks() {
$pygment = PhabricatorEnv::getEnvConfig('pygments.enabled');
if ($pygment) {
- list($err) = exec_manual('pygmentize -h');
- if ($err) {
+ if (!Filesystem::binaryExists('pygmentize')) {
$summary = pht(
'You enabled pygments but the pygmentize script is not '.
'actually available, your $PATH is probably broken.');
$message = pht(
'The environmental variable $PATH does not contain '.
'pygmentize. You have enabled pygments, which requires '.
'pygmentize to be available in your $PATH variable.');
$this
->newIssue('pygments.enabled')
->setName(pht('pygmentize Not Found'))
->setSummary($summary)
->setMessage($message)
->addRelatedPhabricatorConfig('pygments.enabled')
->addPhabricatorConfig('environment.append-paths');
+ } else {
+ list($err) = exec_manual('pygmentize -h');
+ if ($err) {
+ $summary = pht(
+ 'You have enabled pygments and the pygmentize script is '.
+ 'available, but does not seem to work.');
+
+ $message = pht(
+ 'Phabricator has %s available in $PATH, but the binary '.
+ 'exited with an error code when run as %s. Check that it is '.
+ 'installed correctly.',
+ phutil_tag('tt', array(), 'pygmentize'),
+ phutil_tag('tt', array(), 'pygmentize -h'));
+
+ $this
+ ->newIssue('pygments.failed')
+ ->setName(pht('pygmentize Not Working'))
+ ->setSummary($summary)
+ ->setMessage($message)
+ ->addRelatedPhabricatorConfig('pygments.enabled')
+ ->addPhabricatorConfig('environment.append-paths');
+ }
}
}
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Aug 14, 3:57 AM (3 d, 7 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
194879
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)