From bf025c5fb491be1d20de1d6ac16ccf32c3c69c2b Mon Sep 17 00:00:00 2001 From: Aviv Eyal Date: Mon, 24 Jul 2023 00:41:16 -0700 Subject: [PATCH] Aphlict - search for default config in the right place Summary: Fix T15502. Test Plan: Renamed `phorge` dir few times, run `./bin/aphlict status` to see message. Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15502 Differential Revision: https://we.phorge.it/D25344 --- .../management/PhabricatorAphlictManagementWorkflow.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php b/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php index 3d1a26c91d..16bdc69bc1 100644 --- a/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php +++ b/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php @@ -30,16 +30,16 @@ abstract class PhabricatorAphlictManagementWorkflow $full_path = Filesystem::resolvePath($config_file); $show_path = $full_path; } else { - $root = dirname(dirname(phutil_get_library_root('phabricator'))); + $root = dirname(phutil_get_library_root('phorge')); $try = array( - 'phabricator/conf/aphlict/aphlict.custom.json', - 'phabricator/conf/aphlict/aphlict.default.json', + 'conf/aphlict/aphlict.custom.json', + 'conf/aphlict/aphlict.default.json', ); foreach ($try as $config) { $full_path = $root.'/'.$config; - $show_path = $config; + $show_path = '/'.$config; if (Filesystem::pathExists($full_path)) { break; }