From d9d8280d876d5e18fb4871b456f4be819a499baf Mon Sep 17 00:00:00 2001 From: Adam Malone Date: Fri, 27 Mar 2020 09:15:07 +1100 Subject: [PATCH] Alters default config location to allow for incorporation from global require. --- src/Cli/Config.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Cli/Config.php b/src/Cli/Config.php index 881b80d..a90ba87 100644 --- a/src/Cli/Config.php +++ b/src/Cli/Config.php @@ -21,10 +21,12 @@ public function __construct($root) $loader = new YamlConfigLoader(); $processor = new ConfigProcessor(); - $globalConfig = getenv('HOME') . '/.acquiacli/acquiacli.yml'; - $projectConfig = $root . '/acquiacli.yml'; + $homeDir = getenv('HOME'); + $defaultConfig = join(DIRECTORY_SEPARATOR, [dirname(dirname(__DIR__)), 'default.acquiacli.yml']); + $globalConfig = join(DIRECTORY_SEPARATOR, [$homeDir, '.acquiacli', 'acquiacli.yml']); + $projectConfig = join(DIRECTORY_SEPARATOR, [$root, 'acquiacli.yml']); - $processor->extend($loader->load($root . '/default.acquiacli.yml')); + $processor->extend($loader->load($defaultConfig)); $processor->extend($loader->load($globalConfig)); $processor->extend($loader->load($projectConfig));