Added target in config file search.
This commit is contained in:
parent
43c326e6fe
commit
0ac62b09b2
|
@ -115,6 +115,11 @@ public class HebdobotCLI
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
configFile = new File(commandLine.getOptionValue("c"));
|
configFile = new File(commandLine.getOptionValue("c"));
|
||||||
|
|
||||||
|
if (configFile.isDirectory())
|
||||||
|
{
|
||||||
|
configFile = new File(configFile, DEFAULT_CONFIG_FILE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -125,6 +130,17 @@ public class HebdobotCLI
|
||||||
// directory.
|
// directory.
|
||||||
File currentDirectory = new File(System.getProperty("user.dir"));
|
File currentDirectory = new File(System.getProperty("user.dir"));
|
||||||
configFile = new File(currentDirectory, DEFAULT_CONFIG_FILE);
|
configFile = new File(currentDirectory, DEFAULT_CONFIG_FILE);
|
||||||
|
|
||||||
|
if (!configFile.exists())
|
||||||
|
{
|
||||||
|
File configDirectory = new File(currentDirectory.getParentFile(), "conf");
|
||||||
|
File alternativeConfigFile = new File(configDirectory, DEFAULT_CONFIG_FILE);
|
||||||
|
|
||||||
|
if (alternativeConfigFile.exists())
|
||||||
|
{
|
||||||
|
configFile = alternativeConfigFile;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (configFile.exists())
|
if (configFile.exists())
|
||||||
|
|
Loading…
Reference in New Issue
Block a user