X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FApplication.java;h=0ba2a5e7bd29f9b1540f34d12634d7973ca7713f;hb=7d8ba6c44b69e49f071c082d19470c399ff84255;hp=bbac55f5883c110c584f03fa301d998d2caea5a2;hpb=e71869cde71ac42b05f9a1c45776dc5bb7f469d7;p=jalview.git

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index bbac55f..0ba2a5e 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -23,8 +23,6 @@ import java.util.concurrent.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
-import com.sun.management.OperatingSystemMXBean;
-import java.lang.management.ManagementFactory;
 
 import jalview.bin.MemorySetting;
 
@@ -46,6 +44,9 @@ public class Application
 {
     /** The name of our configuration file. */
     public static final String CONFIG_FILE = "getdown.txt";
+    
+    /** Dir where a backup config file might reside */ 
+    public static final String BACKUP_CONFIG_DIR = "install";
 
     /** The name of our target version file. */
     public static final String VERSION_FILE = "version.txt";
@@ -75,11 +76,11 @@ public class Application
             DOWNLOAD(50),
             PATCH(60),
             //VERIFY_RESOURCES(70, 97),
-            VERIFY_RESOURCES(30, 60),
+            VERIFY_RESOURCES(30, 90),
             //REDOWNLOAD_RESOURCES(90),
-            REDOWNLOAD_RESOURCES(70),
+            REDOWNLOAD_RESOURCES(75),
             //UNPACK(98),
-            UNPACK(90),
+            UNPACK(95),
             //LAUNCH(99);
             LAUNCH(100);
 
@@ -193,9 +194,9 @@ public class Application
             this.name = config.getString("ui.name");
             this.progress = config.getRect("ui.progress", new Rectangle(5, 5, 300, 15));
             this.progressText = config.getColor("ui.progress_text", Color.BLACK);
-            this.hideProgressText =  config.getBoolean("ui.hide_progress_text");
-            this.progressSync =  config.getBoolean("ui.progress_sync");
-            this.progressSyncAfterShown =  config.getBoolean("ui.progress_sync_after_shown");
+            this.hideProgressText = config.getBoolean("ui.hide_progress_text");
+            this.progressSync = config.getBoolean("ui.progress_sync_before_shown");
+            this.progressSyncAfterShown = config.getBoolean("ui.progress_sync_after_shown");
             this.keepOnTop =  config.getBoolean("ui.keep_on_top");
             this.displayAppbase =  config.getBoolean("ui.display_appbase");
             this.displayVersion =  config.getBoolean("ui.display_version");
@@ -283,6 +284,7 @@ public class Application
     public Application (EnvConfig envc) {
         _envc = envc;
         _config = getLocalPath(envc.appDir, CONFIG_FILE);
+        _backupConfig = getLocalPath(new File(envc.appDir.getAbsolutePath()+File.separator+BACKUP_CONFIG_DIR), CONFIG_FILE);
     }
 
     /**
@@ -323,11 +325,22 @@ public class Application
      */
     public Resource getConfigResource ()
     {
+    	Resource res = null;
         try {
-            return createResource(CONFIG_FILE, Resource.NORMAL);
+            res = createResource(CONFIG_FILE, Resource.NORMAL);
         } catch (Exception e) {
-            throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
+            log.warning("Invalid appbase '" + _vappbase + "'.", e);
+        }
+        if (res == null) {
+        	try {
+				String backupConfig = BACKUP_CONFIG_DIR + File.separator + CONFIG_FILE;
+        		log.warning("Could not read config '"+CONFIG_FILE+"'. Attempting to use backup '"+backupConfig+"'");
+				res = createResource(backupConfig, Resource.NORMAL);
+        	} catch (Exception ex) {
+				throw new RuntimeException("Invalid appbase in backup config'" + _vappbase + "'.", ex);
+        	}
         }
+        return res;
     }
 
     /**
@@ -602,6 +615,14 @@ public class Application
         } catch (Exception e) {
             log.warning("Failure reading config file", "file", _config, e);
         }
+        if (config == null || config.getString("appbase") == null || config.getString("appbase").isEmpty()) {
+        	try {
+        		config = Config.parseConfig(_backupConfig, opts);
+        		log.warning("Using backup config file", "appdir", getAppDir(), "backupConfig", _backupConfig.getAbsoluteFile());
+        	} catch (Exception e) {
+        		log.warning("Failure reading backup config file", "file", _backupConfig, e);
+        	}
+        }
         
         // see if there's an override config from locator file
         Config locatorConfig = createLocatorConfig(opts);
@@ -1924,8 +1945,6 @@ public class Application
         log.warning("Failure reading locator file",  "file", _locatorFile, e);
       }
       
-      log.info("Returning locatorConfig", locatorConfig);
-      
       return locatorConfig;
     }
     
@@ -1935,6 +1954,7 @@ public class Application
     
     protected final EnvConfig _envc;
     protected File _config;
+    protected File _backupConfig;
     protected Digest _digest;
 
     protected long _version = -1;