revert the deps path reset part and sync

This commit is contained in:
Anatol Belski
2017-08-17 18:19:07 +02:00
parent e7e92b35d0
commit eae3aab2ae

View File

@@ -294,9 +294,9 @@ class Config
return file_get_contents($path);
}/*}}}*/
public static function getDepsLocalPath(bool $reset = false) : ?string
public static function getDepsLocalPath() : ?string
{/*{{{*/
if (NULL == self::$depsLocalPath || $reset) {
if (NULL == self::$depsLocalPath) {
if (file_exists("Makefile")) {
$s = file_get_contents("Makefile");
@@ -308,14 +308,14 @@ class Config
}
}
if (NULL == self::$depsLocalPath || $reset) {
if (NULL == self::$depsLocalPath) {
$tmp = dirname(getcwd()) . DIRECTORY_SEPARATOR . "deps";
if (is_dir($tmp)) {
self::setDepsLocalPath($tmp);
}
}
if (NULL == self::$depsLocalPath || $reset) {
if (NULL == self::$depsLocalPath) {
$tmp = realpath("../deps");
if (is_dir($tmp)) {
self::setDepsLocalPath($tmp);