Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F2681015
D25466.1734632224.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Advanced/Developer...
View Handle
View Hovercard
Size
9 KB
Referenced Files
None
Subscribers
None
D25466.1734632224.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -46,7 +46,7 @@
'rsrc/css/application/conduit/conduit-api.css' => 'ce2cfc41',
'rsrc/css/application/config/config-options.css' => '16c920ae',
'rsrc/css/application/config/config-template.css' => 'e689dbbd',
- 'rsrc/css/application/config/setup-issue.css' => '5eed85b2',
+ 'rsrc/css/application/config/setup-issue.css' => '93231115',
'rsrc/css/application/config/unhandled-exception.css' => '9ecfc00d',
'rsrc/css/application/conpherence/color.css' => 'b17746b0',
'rsrc/css/application/conpherence/durable-column.css' => '2d57072b',
@@ -905,7 +905,7 @@
'project-card-view-css' => 'c1200da7',
'project-triggers-css' => 'cd9c8bb9',
'project-view-css' => '2f7caa20',
- 'setup-issue-css' => '5eed85b2',
+ 'setup-issue-css' => '93231115',
'sprite-login-css' => '07052ee0',
'sprite-tokens-css' => 'f1896dc5',
'syntax-default-css' => '055fc231',
diff --git a/src/applications/config/check/PhabricatorAuthSetupCheck.php b/src/applications/config/check/PhabricatorAuthSetupCheck.php
--- a/src/applications/config/check/PhabricatorAuthSetupCheck.php
+++ b/src/applications/config/check/PhabricatorAuthSetupCheck.php
@@ -74,7 +74,8 @@
->addRelatedPhabricatorConfig('auth.lock-config')
->addCommand(
hsprintf(
- '<tt>$</tt> ./bin/auth lock'));
+ '<tt>%s $</tt>./bin/auth lock',
+ PlatformSymbols::getPlatformServerPath()));
}
}
}
diff --git a/src/applications/config/check/PhabricatorBaseURISetupCheck.php b/src/applications/config/check/PhabricatorBaseURISetupCheck.php
--- a/src/applications/config/check/PhabricatorBaseURISetupCheck.php
+++ b/src/applications/config/check/PhabricatorBaseURISetupCheck.php
@@ -96,9 +96,8 @@
->setMessage($message)
->addCommand(
hsprintf(
- '<tt>$</tt> %s',
- csprintf(
- './bin/config set phabricator.base-uri %s',
- $base_uri_guess)));
+ '<tt>%s $</tt>./bin/config set phabricator.base-uri %s',
+ PlatformSymbols::getPlatformServerPath(),
+ $base_uri_guess));
}
}
diff --git a/src/applications/config/check/PhabricatorDaemonsSetupCheck.php b/src/applications/config/check/PhabricatorDaemonsSetupCheck.php
--- a/src/applications/config/check/PhabricatorDaemonsSetupCheck.php
+++ b/src/applications/config/check/PhabricatorDaemonsSetupCheck.php
@@ -49,7 +49,10 @@
->setName(pht('Daemons Are Not Running'))
->setSummary($summary)
->setMessage($message)
- ->addCommand('$ ./bin/phd start');
+ ->addCommand(
+ hsprintf(
+ '<tt>%s $</tt>./bin/phd start',
+ PlatformSymbols::getPlatformServerPath()));
}
$expect_user = PhabricatorEnv::getEnvConfig('phd.user');
@@ -90,7 +93,10 @@
->setSummary($summary)
->setMessage($message)
->addPhabricatorConfig('phd.user')
- ->addCommand('$ ./bin/phd restart');
+ ->addCommand(
+ hsprintf(
+ '<tt>%s $</tt>./bin/phd restart',
+ PlatformSymbols::getPlatformServerPath()));
break;
}
diff --git a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
--- a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
+++ b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
@@ -35,11 +35,13 @@
->addPhabricatorConfig('mysql.port')
->addCommand(
hsprintf(
- '<tt>$</tt> ./bin/config set mysql.host %s',
+ '<tt>%s $</tt>./bin/config set mysql.host %s',
+ PlatformSymbols::getPlatformServerPath(),
$host))
->addCommand(
hsprintf(
- '<tt>$</tt> ./bin/config set mysql.port %s',
+ '<tt>%s $</tt>./bin/config set mysql.port %s',
+ PlatformSymbols::getPlatformServerPath(),
$port));
}
@@ -134,7 +136,10 @@
->setName(pht('Setup MySQL Schema'))
->setMessage($message)
->setIsFatal(true)
- ->addCommand(hsprintf('<tt>$</tt> ./bin/storage upgrade'));
+ ->addCommand(
+ hsprintf(
+ '<tt>%s $</tt>./bin/storage upgrade',
+ PlatformSymbols::getPlatformServerPath()));
return true;
}
@@ -160,7 +165,9 @@
->setIsFatal(true)
->setMessage($message)
->addCommand(
- hsprintf('<tt>$</tt> ./bin/storage upgrade'));
+ hsprintf(
+ '<tt>%s $</tt>./bin/storage upgrade',
+ PlatformSymbols::getPlatformServerPath()));
return true;
}
diff --git a/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php b/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
--- a/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
+++ b/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
@@ -60,7 +60,10 @@
$this
->newIssue('elastic.missing-index')
->setName(pht('Elasticsearch Index Not Found'))
- ->addCommand('./bin/search init')
+ ->addCommand(
+ hsprintf(
+ '<tt>%s $</tt>./bin/search init',
+ PlatformSymbols::getPlatformServerPath()))
->setSummary($summary)
->setMessage($message);
@@ -76,7 +79,10 @@
$this
->newIssue('elastic.broken-index')
->setName(pht('Elasticsearch Index Schema Mismatch'))
- ->addCommand('./bin/search init')
+ ->addCommand(
+ hsprintf(
+ '<tt>%s $</tt>./bin/search init',
+ PlatformSymbols::getPlatformServerPath()))
->setSummary($summary)
->setMessage($message);
}
diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -76,7 +76,10 @@
$issue->setMessage($message);
if ($found_local) {
- $command = csprintf('$ ./bin/config delete %s', $key);
+ $command = hsprintf(
+ '<tt>%s $</tt>./bin/config delete %s',
+ PlatformSymbols::getPlatformServerPath(),
+ $key);
$issue->addCommand($command);
}
@@ -166,9 +169,12 @@
'target' => '_blank',
),
$doc_name));
- $command = csprintf(
- '$ ./bin/config delete --database %R',
- $key);
+ $command = hsprintf(
+ '<tt>%s $</tt>%s',
+ PlatformSymbols::getPlatformServerPath(),
+ csprintf(
+ './bin/config delete --database %R',
+ $key));
$this->newIssue('config.locked.'.$key)
->setShortName(pht('Deprecated Config Source'))
diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
--- a/src/applications/config/view/PhabricatorSetupIssueView.php
+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
@@ -83,11 +83,11 @@
// TODO: We should do a better job of detecting how to install extensions
// on the current system.
$install_commands = hsprintf(
- "\$ sudo apt-get install php-<em>extname</em> ".
+ "<tt>$</tt>sudo apt-get install php-<em>extname</em> ".
"# Debian / Ubuntu\n".
- "\$ sudo dnf install php-<em>extname</em> ".
+ "<tt>$</tt>sudo dnf install php-<em>extname</em> ".
"# Red Hat / Derivatives\n".
- "\$ sudo yum install php-<em>extname</em> ".
+ "<tt>$</tt>sudo yum install php-<em>extname</em> ".
"# Older Red Hat versions");
$fallback_info = pht(
@@ -286,7 +286,8 @@
$update = array();
foreach ($configs as $key) {
$update[] = hsprintf(
- '<tt>$</tt> ./bin/config set %s <em>value</em>',
+ '<tt>%s $</tt>./bin/config set %s <em>value</em>',
+ PlatformSymbols::getPlatformServerPath(),
$key);
}
$update = phutil_tag('pre', array(), phutil_implode_html("\n", $update));
diff --git a/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php b/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php
--- a/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php
+++ b/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php
@@ -24,8 +24,12 @@
->setSummary(pht('Summary'))
->setMessage(pht('Message'))
->setIssueKey('example.key')
- ->addCommand('$ # Add Command')
- ->addCommand(hsprintf('<tt>$</tt> %s', '$ ls -1 > /dev/null'))
+ ->addCommand(hsprintf(
+ '<tt>%s $</tt># Add Command',
+ PlatformSymbols::getPlatformServerPath()))
+ ->addCommand(hsprintf(
+ '<tt>%s $</tt>ls -1 > /dev/null',
+ PlatformSymbols::getPlatformServerPath()))
->addPHPConfig('php.config.example')
->addPhabricatorConfig('test.value')
->addPHPExtension('libexample');
diff --git a/webroot/rsrc/css/application/config/setup-issue.css b/webroot/rsrc/css/application/config/setup-issue.css
--- a/webroot/rsrc/css/application/config/setup-issue.css
+++ b/webroot/rsrc/css/application/config/setup-issue.css
@@ -122,6 +122,11 @@
padding: 12px 0;
}
+.setup-issue-config > pre > tt {
+ user-select: none;
+ margin-right: 0.5em;
+}
+
.setup-issue-config + .setup-issue-config {
padding-top: 0;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Dec 19, 18:17 (6 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1015340
Default Alt Text
D25466.1734632224.diff (9 KB)
Attached To
Mode
D25466: Improve command line prompts in setup issue pages
Attached
Detach File
Event Timeline
Log In to Comment