Skip to content

Commit

Permalink
We already have an option for that.
Browse files Browse the repository at this point in the history
  • Loading branch information
yunosh committed Jun 12, 2017
1 parent 6aff961 commit 741fbb7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
5 changes: 3 additions & 2 deletions components/config/conf.php.dist
Expand Up @@ -10,8 +10,9 @@
* Boolean values may be true or false (never quotes).
*/

/* Target directory for git checkouts. */
$conf['git_base'] = '';
/* Directory for git checkouts. Either the base directory of all checkouts, or
/* the checkout of a monolithic repository. */
$conf['horde_root'] = '';

/* PEAR server name. Only change for testing purposes. */
$conf['releaseserver'] = 'pear.horde.org';
Expand Down
2 changes: 1 addition & 1 deletion components/lib/Components/Config/Cli.php
Expand Up @@ -154,7 +154,7 @@ public function __construct(
'--horde-root',
array(
'action' => 'store',
'help' => 'The root of the Horde git repository.'
'help' => 'The root of the Horde git repository(ies).'
)
)
);
Expand Down
5 changes: 4 additions & 1 deletion components/lib/Components/Helper/Root.php
Expand Up @@ -143,7 +143,10 @@ public function getGitIgnore()
*/
public function getRoot()
{
return $this->_options['git_base'];
if (empty($this->_root_path)) {
$this->_root_path = $this->_determineRoot();
}
return $this->_root_path;
}

/**
Expand Down

0 comments on commit 741fbb7

Please sign in to comment.