Compare commits
No commits in common. "56872a04c497efdd66a22d234cf0de760328cd80" and "1c851632c3082a7a9462350064cbde7125379347" have entirely different histories.
56872a04c4
...
1c851632c3
1 changed files with 26 additions and 17 deletions
43
bin/cfg
43
bin/cfg
|
|
@ -105,7 +105,7 @@ $collection = (new Input\InputCollection())
|
||||||
->description('Path where the config/ directory of the package conf files is located, defaults to the working dir')
|
->description('Path where the config/ directory of the package conf files is located, defaults to the working dir')
|
||||||
) // }}}
|
) // }}}
|
||||||
|
|
||||||
->add( Input\InputTypeFactory::build('LongOption')->name('siteDir')->short('s') // {{{
|
->add( Input\InputTypeFactory::build('LongOption')->name('siteDir') // {{{
|
||||||
->flags(AbstractInputType::FLAG_OPTIONAL | Input\AbstractInputType::FLAG_VALUE_REQUIRED)
|
->flags(AbstractInputType::FLAG_OPTIONAL | Input\AbstractInputType::FLAG_VALUE_REQUIRED)
|
||||||
->description('Site/instance directory below config/. Accepts owner_xyz or config/owner_xyz')
|
->description('Site/instance directory below config/. Accepts owner_xyz or config/owner_xyz')
|
||||||
->validator(new Input\Validator(
|
->validator(new Input\Validator(
|
||||||
|
|
@ -320,6 +320,16 @@ $appPath = $argv->find('appPath');
|
||||||
if (!$appPath) $appPath = getcwd().'/';
|
if (!$appPath) $appPath = getcwd().'/';
|
||||||
$appPath = rtrim($appPath, '/').'/';
|
$appPath = rtrim($appPath, '/').'/';
|
||||||
|
|
||||||
|
/* $it = new RecursiveDirectoryIterator($appPath);
|
||||||
|
|
||||||
|
foreach(new RecursiveIteratorIterator($it) as $file)
|
||||||
|
{
|
||||||
|
$configDir = $file->getPath();
|
||||||
|
if ($file->isDir() && $file->getFilename() == '.' && basename($configDir) == 'config') {
|
||||||
|
echo "found config dir: $configDir\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
$mode = ($argv->find('mode') == '') ? null : $argv->find('mode');
|
$mode = ($argv->find('mode') == '') ? null : $argv->find('mode');
|
||||||
$cfg = (new Settings([], $mode))->appPath($appPath)->prefix($prefix);
|
$cfg = (new Settings([], $mode))->appPath($appPath)->prefix($prefix);
|
||||||
// pkgPath points to package defaults (e.g. <prefix>.default.conf.php)
|
// pkgPath points to package defaults (e.g. <prefix>.default.conf.php)
|
||||||
|
|
@ -379,22 +389,21 @@ case 'show':
|
||||||
echo $out.PHP_EOL;
|
echo $out.PHP_EOL;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'write':
|
case 'write':
|
||||||
$inputPayload = $argv->find('in');
|
$inputPayload = $argv->find('in');
|
||||||
if (!$inputPayload && $settings['key'] === '')
|
if (!$inputPayload && $settings['key'] === '')
|
||||||
{
|
{
|
||||||
fwrite(STDERR, 'Nothing to write: provide SETTING or --in.'.PHP_EOL);
|
fwrite(STDERR, 'Nothing to write: provide SETTING or --in.'.PHP_EOL);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
$path = ($settings['key'] !== '') ? explode(':', $settings['key']) : [];
|
$path = ($settings['key'] !== '') ? explode(':', $settings['key']) : [];
|
||||||
verboseLog($verbose, 'write source: '.($inputPayload ? '--in' : 'SETTING'));
|
verboseLog($verbose, 'write source: '.($inputPayload ? '--in' : 'SETTING'));
|
||||||
|
if ($inputPayload)
|
||||||
if ($inputPayload)
|
{
|
||||||
{
|
$setting2write = $inputPayload;
|
||||||
$setting2write = $inputPayload;
|
}
|
||||||
}
|
else
|
||||||
else
|
{
|
||||||
{
|
|
||||||
$setting2write = $settings['value'];
|
$setting2write = $settings['value'];
|
||||||
}
|
}
|
||||||
verboseLog($verbose, 'write path: '.json_encode($path));
|
verboseLog($verbose, 'write path: '.json_encode($path));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue