Merge branch 'master' into timeoutVerify
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown</artifactId>
|
||||
<version>1.8.3-SNAPSHOT</version>
|
||||
<version>1.8.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>getdown-core</artifactId>
|
||||
|
||||
@@ -139,9 +139,10 @@ public final class EnvConfig {
|
||||
}
|
||||
}
|
||||
|
||||
// ensure that we were able to fine an app dir
|
||||
// if no appdir was provided, default to the current working directory
|
||||
if (appDir == null) {
|
||||
return null; // caller will report problem to user
|
||||
appDir = System.getProperty("user.dir");
|
||||
appDirProv = "default (cwd)";
|
||||
}
|
||||
|
||||
notes.add(Note.info("Using appdir from " + appDirProv + ": " + appDir));
|
||||
|
||||
Reference in New Issue
Block a user