jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed unresolved symlinks when locating FTL resources

Browse source
This commit is contained in:
Vhati 2017-11-26 01:19:44 -05:00
parent 738c05e853
commit 12f4db94f9
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/vhati/modmanager/core/FTLUtilities.java
View file

@ -16,11 +16,13 @@ public class FTLUtilities {
/** /**
* Confirms the FTL resources dir exists and contains the dat files. * Confirms the FTL resources dir exists and contains the dat files.
*
* Note: Do d.getCanonicalFile() to resolve any symlinks first!
*/ */
public static boolean isDatsDirValid( File d ) { public static boolean isDatsDirValid( File d ) {
if ( !d.exists() || !d.isDirectory() ) return false; if ( !d.exists() || !d.isDirectory() ) return false;
if ( !new File(d, "data.dat").exists() ) return false; if ( !new File( d, "data.dat" ).exists() ) return false;
if ( !new File(d, "resource.dat").exists() ) return false; if ( !new File( d, "resource.dat" ).exists() ) return false;
return true; return true;
} }
@ -59,6 +61,10 @@ public class FTLUtilities {
File result = null; File result = null;
for ( File candidate : candidates ) { for ( File candidate : candidates ) {
// Resolve symlinks.
try {candidate = candidate.getCanonicalFile();}
catch ( IOException e ) {continue;}
if ( isDatsDirValid( candidate ) ) { if ( isDatsDirValid( candidate ) ) {
result = candidate; result = candidate;
break; break;