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

Merge pull request #2706 from Lucwousin/symlinks

Browse Source 
client: Respect symlinks for the config file
This commit is contained in:
Lucwousin
2020-06-21 17:53:21 +02:00
committed by GitHub
parent b76c1b2eca e2e146efbf
commit 13fbfb0047
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,7 +255,7 @@ public class RuneLite
.withRequiredArg()
.ofType(ClientUpdateCheckMode.class)
.defaultsTo(ClientUpdateCheckMode.AUTO)
.withValuesConvertedBy(new EnumConverter<ClientUpdateCheckMode>(ClientUpdateCheckMode.class)
.withValuesConvertedBy(new EnumConverter<>(ClientUpdateCheckMode.class)
{
@Override
public ClientUpdateCheckMode convert(String v)
@@ -326,8 +326,9 @@ public class RuneLite
System.setProperty("cli.world", String.valueOf(world));
}
final File configFile = resolveLinks(options.valueOf(configfile));
Properties properties = new Properties();
try (FileInputStream in = new FileInputStream(RuneLite.RUNELITE_DIR + "\\runeliteplus.properties"))
try (FileInputStream in = new FileInputStream(configFile))
{
properties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
try
@@ -402,7 +403,7 @@ public class RuneLite
injector = Guice.createInjector(new RuneLiteModule(
clientLoader,
options.has("safe-mode"),
options.valueOf(configfile)));
configFile));
injector.getInstance(RuneLite.class).start();
final long end = System.currentTimeMillis();
@@ -644,4 +645,16 @@ public class RuneLite
return null;
}
}
private static File resolveLinks(File f)
{
try
{
return f.toPath().toRealPath().toFile();
}
catch (IOException e)
{
return f;
}
}
}