Library fixes + "make install" fix

[fanfix.git] / src / be / nikiroo / fanfix / Instance.java

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index ea66aec0d1b3c7fcedc65dfc31366e29a9b67708..2289445b968a60cb7bd7b5fdf6556a559647b34c 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -26,6 +26,34 @@ public class Instance {
                // Most of the rest is dependent upon this:
                config = new ConfigBundle();
 
+               String configDir = System.getenv("CONFIG_DIR");
+               if (configDir == null) {
+                       configDir = new File(System.getProperty("user.home"), ".fanfix")
+                                       .getPath();
+               }
+               if (configDir != null) {
+                       if (!new File(configDir).exists()) {
+                               new File(configDir).mkdirs();
+                       } else {
+                               Bundles.setDirectory(configDir);
+                       }
+
+                       try {
+                               config = new ConfigBundle();
+                               config.updateFile(configDir);
+                       } catch (IOException e) {
+                               syserr(e);
+                       }
+                       try {
+                               trans = new StringIdBundle(getLang());
+                               trans.updateFile(configDir);
+                       } catch (IOException e) {
+                               syserr(e);
+                       }
+
+                       Bundles.setDirectory(configDir);
+               }
+
                trans = new StringIdBundle(getLang());
                lib = new Library(getFile(Config.LIBRARY_DIR));
                debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false);
@@ -63,34 +91,6 @@ public class Instance {
                        coverDir = null;
                }
 
-               String configDir = System.getenv("CONFIG_DIR");
-               if (configDir == null) {
-                       configDir = new File(System.getProperty("user.home"), ".fanfix")
-                                       .getPath();
-               }
-               if (configDir != null) {
-                       if (!new File(configDir).exists()) {
-                               new File(configDir).mkdirs();
-                       } else {
-                               Bundles.setDirectory(configDir);
-                       }
-
-                       try {
-                               config = new ConfigBundle();
-                               config.updateFile(configDir);
-                       } catch (IOException e) {
-                               syserr(e);
-                       }
-                       try {
-                               trans = new StringIdBundle(getLang());
-                               trans.updateFile(configDir);
-                       } catch (IOException e) {
-                               syserr(e);
-                       }
-
-                       Bundles.setDirectory(configDir);
-               }
-
                try {
                        String ua = config.getString(Config.USER_AGENT);
                        int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);