Fix directory logic

This commit is contained in:
Matthew Nesbit 2016-08-03 10:17:44 +01:00
parent 244150d658
commit d32db5d08a

View File

@ -122,7 +122,9 @@ fun main(args: Array<String>) {
val appConfig = ConfigFactory.parseFile(configFile)
val cmdlineOverrideMap = HashMap<String, Any?>()
cmdlineOverrideMap.put("basedir", baseDirectoryPath.toString())
if (cmdlineOptions.has(ParamsSpec.baseDirectoryArg)) {
cmdlineOverrideMap.put("basedir", baseDirectoryPath.toString())
}
val overrideConfig = ConfigFactory.parseMap(cmdlineOverrideMap)
val mergedAndResolvedConfig = overrideConfig.withFallback(appConfig).withFallback(defaultConfig).resolve()