Fix rule file inclusion path

The inclusion was not taking `*' into consideration, leading the
relative configuration inclusion to fail. That was very annoying.
This commit is contained in:
Felipe Zimmerle
2016-11-11 15:03:15 -03:00
parent 361ec8340f
commit 8b4f1bc46c
2 changed files with 14 additions and 2 deletions

View File

@@ -70,6 +70,11 @@ std::string find_resource(const std::string& resource,
}
delete iss;
// What about `*' ?
if (utils::expandEnv(resource, 0).size() > 1) {
return resource;
}
// Trying the same path of the configuration file.
std::string f = get_path(config) + "/" + resource;
iss = new std::ifstream(f, std::ios::in);
@@ -80,6 +85,11 @@ std::string find_resource(const std::string& resource,
}
delete iss;
// What about `*' ?
if (utils::expandEnv(f, 0).size() > 1) {
return f;
}
return std::string("");
}