From abff136aa4374e018820e9f15813f019218069f8 Mon Sep 17 00:00:00 2001 From: Vhati Date: Sun, 26 Nov 2017 01:23:00 -0500 Subject: [PATCH] Added alternate locations to locate FTL resources on Linux --- .../net/vhati/modmanager/core/FTLUtilities.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/vhati/modmanager/core/FTLUtilities.java b/src/main/java/net/vhati/modmanager/core/FTLUtilities.java index c66df4e..3b96527 100644 --- a/src/main/java/net/vhati/modmanager/core/FTLUtilities.java +++ b/src/main/java/net/vhati/modmanager/core/FTLUtilities.java @@ -38,6 +38,10 @@ public class FTLUtilities { if ( xdgDataHome == null ) xdgDataHome = System.getProperty("user.home") +"/.local/share"; + String winePrefix = System.getProperty("WINEPREFIX"); + if ( winePrefix == null ) + winePrefix = System.getProperty("user.home") +"/.wine"; + File[] candidates = new File[] { // Windows - Steam new File( new File(""+System.getenv("ProgramFiles(x86)")), steamPath ), @@ -50,12 +54,18 @@ public class FTLUtilities { new File( new File(""+System.getenv("ProgramFiles")), humblePath ), // Linux - Steam new File( xdgDataHome +"/Steam/SteamApps/common/FTL Faster Than Light/data/resources" ), - new File( xdgDataHome +"/.steam/steam/SteamApps/common/FTL Faster Than Light/data/resources" ), + new File( xdgDataHome +"/Steam/steamapps/common/FTL Faster Than Light/data/resources" ), + new File( System.getProperty("user.home") +"/.steam/steam/SteamApps/common/FTL Faster Than Light/data/resources" ), new File( System.getProperty("user.home") +"/.steam/steam/steamapps/common/FTL Faster Than Light/data/resources" ), // OSX - Steam new File( System.getProperty("user.home") +"/Library/Application Support/Steam/SteamApps/common/FTL Faster Than Light/FTL.app/Contents/Resources" ), // OSX - new File( "/Applications/FTL.app/Contents/Resources" ) + new File( "/Applications/FTL.app/Contents/Resources" ), + // Linux Wine + new File( winePrefix +"/drive_c/Program Files (x86)/"+ gogPath ), + new File( winePrefix +"/drive_c/Program Files/"+ gogPath ), + new File( winePrefix +"/drive_c/Program Files (x86)/"+ humblePath ), + new File( winePrefix +"/drive_c/Program Files/"+ humblePath ) }; File result = null;