From 43123e46a3aaa4f41767e9f6f4e65eb40a626be5 Mon Sep 17 00:00:00 2001 From: Trevor Date: Fri, 6 Mar 2020 13:21:23 -0500 Subject: [PATCH] client: fix default sessionfile/config args --- .../main/java/net/runelite/client/RuneLite.java | 14 ++++++++------ .../net/runelite/client/config/ConfigManager.java | 4 ++-- .../runelite/client/config/ConfigManagerTest.java | 4 ++-- .../runelite/client/plugins/PluginManagerTest.java | 8 ++++---- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 5ea49d8640..72b6889064 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -88,8 +88,8 @@ public class RuneLite public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles"); public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots"); public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs"); - public static final String DEFAULT_SESSION_FILE = "session"; - public static final String DEFAULT_CONFIG_FILE = "settings.properties"; + public static final File DEFAULT_SESSION_FILE = new File(RUNELITE_DIR, "session"); + public static final File DEFAULT_CONFIG_FILE = new File(RUNELITE_DIR, "settings.properties"); @Getter private static Injector injector; @@ -179,12 +179,14 @@ public class RuneLite parser.accepts("debug", "Show extra debugging output"); final ArgumentAcceptingOptionSpec sessionfile = parser.accepts("sessionfile", "Use a specified session file") - .withRequiredArg().defaultsTo(DEFAULT_SESSION_FILE) - .withValuesConvertedBy(new ConfigFileConverter()); + .withRequiredArg() + .withValuesConvertedBy(new ConfigFileConverter()) + .defaultsTo(DEFAULT_SESSION_FILE); final ArgumentAcceptingOptionSpec configfile = parser.accepts("config", "Use a specified config file") - .withRequiredArg().defaultsTo(DEFAULT_CONFIG_FILE) - .withValuesConvertedBy(new ConfigFileConverter()); + .withRequiredArg() + .withValuesConvertedBy(new ConfigFileConverter()) + .defaultsTo(DEFAULT_CONFIG_FILE); final ArgumentAcceptingOptionSpec updateMode = parser .accepts("rs", "Select client type") diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index 6e7102920f..8bf579d115 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -142,7 +142,7 @@ public class ConfigManager else { File profileDir = new File(RuneLite.PROFILES_DIR, session.getUsername().toLowerCase()); - return new File(profileDir, RuneLite.DEFAULT_CONFIG_FILE); + return new File(profileDir, RuneLite.DEFAULT_CONFIG_FILE.getName()); } } @@ -335,7 +335,7 @@ public class ConfigManager parent.mkdirs(); - File tempFile = new File(parent, RuneLite.DEFAULT_CONFIG_FILE + ".tmp"); + File tempFile = new File(parent, RuneLite.DEFAULT_CONFIG_FILE.getName() + ".tmp"); try (FileOutputStream out = new FileOutputStream(tempFile)) { diff --git a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java index d98fee4097..aae6194a3c 100644 --- a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java @@ -61,11 +61,11 @@ public class ConfigManagerTest @Bind @Named("sessionfile") - File sessionfile = new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_SESSION_FILE); + File sessionfile = RuneLite.DEFAULT_SESSION_FILE; @Bind @Named("config") - File config = new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_CONFIG_FILE); + File config = RuneLite.DEFAULT_CONFIG_FILE; @Inject ConfigManager manager; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java index 8aaaa9ea86..929d83bbd4 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java @@ -84,8 +84,8 @@ public class PluginManagerTest { Injector injector = Guice.createInjector(Modules .override(new RuneLiteModule(() -> null, true, - new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_SESSION_FILE), - new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_CONFIG_FILE))) + RuneLite.DEFAULT_SESSION_FILE, + RuneLite.DEFAULT_CONFIG_FILE)) .with(BoundFieldModule.of(this))); RuneLite.setInjector(injector); @@ -147,8 +147,8 @@ public class PluginManagerTest List modules = new ArrayList<>(); modules.add(new GraphvizModule()); modules.add(new RuneLiteModule(() -> null, true, - new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_SESSION_FILE), - new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_CONFIG_FILE))); + RuneLite.DEFAULT_SESSION_FILE, + RuneLite.DEFAULT_CONFIG_FILE)); PluginManager pluginManager = new PluginManager(true, null, null, null, null, null); pluginManager.loadCorePlugins();