Merge pull request #224 from neuweiler/master
fix regression of PR 221: extract version before replacing variables
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
*.txt eol=lf
|
||||||
|
*#txt eol=lf
|
||||||
|
*.sh eol=lf
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
/*/target/
|
/*/target/
|
||||||
/target/
|
/target/
|
||||||
core/src/main/java/com/threerings/getdown/data/Build.java
|
core/src/main/java/com/threerings/getdown/data/Build.java
|
||||||
|
*.iml
|
||||||
|
|||||||
@@ -594,7 +594,10 @@ public class Application
|
|||||||
* like the appbase and version.
|
* like the appbase and version.
|
||||||
*/
|
*/
|
||||||
public void initBase (Config config) throws IOException {
|
public void initBase (Config config) throws IOException {
|
||||||
// first determine our application base, this way if anything goes wrong later in the
|
// first extract our version information
|
||||||
|
_version = config.getLong("version", -1L);
|
||||||
|
|
||||||
|
// determine our application base, this way if anything goes wrong later in the
|
||||||
// process, our caller can use the appbase to download a new configuration file
|
// process, our caller can use the appbase to download a new configuration file
|
||||||
_appbase = config.getString("appbase");
|
_appbase = config.getString("appbase");
|
||||||
if (_appbase == null) {
|
if (_appbase == null) {
|
||||||
@@ -609,9 +612,6 @@ public class Application
|
|||||||
_appbase += "/";
|
_appbase += "/";
|
||||||
}
|
}
|
||||||
|
|
||||||
// extract our version information
|
|
||||||
_version = config.getLong("version", -1L);
|
|
||||||
|
|
||||||
// if we are a versioned deployment, create a versioned appbase
|
// if we are a versioned deployment, create a versioned appbase
|
||||||
try {
|
try {
|
||||||
_vappbase = createVAppBase(_version);
|
_vappbase = createVAppBase(_version);
|
||||||
|
|||||||
Reference in New Issue
Block a user