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 4e4705b352a5aa569cd958b4fc1244b004c1a227..2289445b968a60cb7bd7b5fdf6556a559647b34c 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -23,9 +23,37 @@ public class Instance {
        private static File readerTmp;
 
        static {
-               // Most of the rest is dependant upon this:
+               // 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);
@@ -48,7 +76,7 @@ public class Instance {
                                        tmp = new File(tmpDir, "fanfic-tmp");
                                }
                                if (readerTmp == null) {
-                                       tmp = new File(tmpDir, "fanfic-reader");
+                                       readerTmp = new File(tmpDir, "fanfic-reader");
                                }
                        } else {
                                syserr(new IOException(
@@ -63,28 +91,6 @@ public class Instance {
                        coverDir = null;
                }
 
-               String configDir = System.getenv("CONFIG_DIR");
-               if (configDir != null) {
-                       if (new File(configDir).isDirectory()) {
-                               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);
-                               }
-                       } else {
-                               syserr(new IOException("Configuration directory not found: "
-                                               + configDir));
-                       }
-               }
-
                try {
                        String ua = config.getString(Config.USER_AGENT);
                        int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);