ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: fix default sessionfile/config args

Browse Source
This commit is contained in:
Trevor
2020-03-06 13:21:23 -05:00
committed by Adam
parent 25d84dddec
commit 43123e46a3
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -88,8 +88,8 @@ public class RuneLite
public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles"); 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 SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots");
public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs"); public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs");
public static final String DEFAULT_SESSION_FILE = "session"; public static final File DEFAULT_SESSION_FILE = new File(RUNELITE_DIR, "session");
public static final String DEFAULT_CONFIG_FILE = "settings.properties"; public static final File DEFAULT_CONFIG_FILE = new File(RUNELITE_DIR, "settings.properties");
@Getter @Getter
private static Injector injector; private static Injector injector;
@@ -179,12 +179,14 @@ public class RuneLite
parser.accepts("debug", "Show extra debugging output"); parser.accepts("debug", "Show extra debugging output");
final ArgumentAcceptingOptionSpec<File> sessionfile = parser.accepts("sessionfile", "Use a specified session file") final ArgumentAcceptingOptionSpec<File> sessionfile = parser.accepts("sessionfile", "Use a specified session file")
.withRequiredArg().defaultsTo(DEFAULT_SESSION_FILE) .withRequiredArg()
.withValuesConvertedBy(new ConfigFileConverter()); .withValuesConvertedBy(new ConfigFileConverter())
.defaultsTo(DEFAULT_SESSION_FILE);
final ArgumentAcceptingOptionSpec<File> configfile = parser.accepts("config", "Use a specified config file") final ArgumentAcceptingOptionSpec<File> configfile = parser.accepts("config", "Use a specified config file")
.withRequiredArg().defaultsTo(DEFAULT_CONFIG_FILE) .withRequiredArg()
.withValuesConvertedBy(new ConfigFileConverter()); .withValuesConvertedBy(new ConfigFileConverter())
.defaultsTo(DEFAULT_CONFIG_FILE);
final ArgumentAcceptingOptionSpec<ClientUpdateCheckMode> updateMode = parser final ArgumentAcceptingOptionSpec<ClientUpdateCheckMode> updateMode = parser
.accepts("rs", "Select client type") .accepts("rs", "Select client type")

4
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -142,7 +142,7 @@ public class ConfigManager
else else
{ {
File profileDir = new File(RuneLite.PROFILES_DIR, session.getUsername().toLowerCase()); 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(); 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)) try (FileOutputStream out = new FileOutputStream(tempFile))
{ {

4
runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java
View File

@@ -61,11 +61,11 @@ public class ConfigManagerTest
@Bind @Bind
@Named("sessionfile") @Named("sessionfile")
File sessionfile = new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_SESSION_FILE); File sessionfile = RuneLite.DEFAULT_SESSION_FILE;
@Bind @Bind
@Named("config") @Named("config")
File config = new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_CONFIG_FILE); File config = RuneLite.DEFAULT_CONFIG_FILE;
@Inject @Inject
ConfigManager manager; ConfigManager manager;

8
runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
View File

@@ -84,8 +84,8 @@ public class PluginManagerTest
{ {
Injector injector = Guice.createInjector(Modules Injector injector = Guice.createInjector(Modules
.override(new RuneLiteModule(() -> null, true, .override(new RuneLiteModule(() -> null, true,
new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_SESSION_FILE), RuneLite.DEFAULT_SESSION_FILE,
new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_CONFIG_FILE))) RuneLite.DEFAULT_CONFIG_FILE))
.with(BoundFieldModule.of(this))); .with(BoundFieldModule.of(this)));
RuneLite.setInjector(injector); RuneLite.setInjector(injector);
@@ -147,8 +147,8 @@ public class PluginManagerTest
List<Module> modules = new ArrayList<>(); List<Module> modules = new ArrayList<>();
modules.add(new GraphvizModule()); modules.add(new GraphvizModule());
modules.add(new RuneLiteModule(() -> null, true, modules.add(new RuneLiteModule(() -> null, true,
new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_SESSION_FILE), RuneLite.DEFAULT_SESSION_FILE,
new File(RuneLite.RUNELITE_DIR, RuneLite.DEFAULT_CONFIG_FILE))); RuneLite.DEFAULT_CONFIG_FILE));
PluginManager pluginManager = new PluginManager(true, null, null, null, null, null); PluginManager pluginManager = new PluginManager(true, null, null, null, null, null);
pluginManager.loadCorePlugins(); pluginManager.loadCorePlugins();