From 7d4c3830e2128253dbb0212d1afb737aa28e033b Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 26 May 2019 00:49:52 +0200 Subject: [PATCH] Revert "fix some default paths" This reverts commit d0cad92991db43c8d8d00e9fe6bce349e0bbd780. --- src/be/nikiroo/fanfix/Instance.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index 74221b00..74897491 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -325,8 +325,8 @@ public class Instance { */ public static boolean isVersionCheckNeeded() { try { - long wait = config.getInteger(Config.NETWORK_UPDATE_INTERVAL, 0) - * 24 * 60 * 60 * 1000; + long wait = config.getInteger(Config.NETWORK_UPDATE_INTERVAL, 0) * 24 * 60 + * 60 * 1000; if (wait >= 0) { String lastUpString = IOUtils.readSmallFile(new File(configDir, "LAST_UPDATE")); @@ -370,14 +370,18 @@ public class Instance { } /** - * The configuration directory (will check, in order of preference, the - * system properties, the environment and then defaults to - * {@link Instance#getHome()}/.fanfix). + * The configuration directory (will check, in order of preference, + * {@link Bundles#getDirectory()}, the system properties, the environment + * and then defaults to $HOME/.fanfix). * * @return the config directory */ private static String getConfigDir() { - String configDir = System.getProperty("CONFIG_DIR"); + String configDir = Bundles.getDirectory(); + + if (configDir == null) { + configDir = System.getProperty("CONFIG_DIR"); + } if (configDir == null) { configDir = System.getenv("CONFIG_DIR"); @@ -456,9 +460,6 @@ public class Instance { String libDir = System.getenv("BOOKS_DIR"); if (libDir == null || libDir.isEmpty()) { libDir = config.getString(Config.LIBRARY_DIR, "$HOME/Books"); - if (!getFile(libDir).isAbsolute()) { - libDir = new File(configDir, libDir).getPath(); - } } try { lib = new LocalLibrary(getFile(libDir)); -- 2.27.0