fixed weird path stuff

hyperdefined · hyperdefined · commit 3adea091802a · 2022-11-01T17:36:43.000-04:00
also fixes launching the game on linux
diff --git a/src/main/java/lol/hyper/customlauncher/ConfigHandler.java b/src/main/java/lol/hyper/customlauncher/ConfigHandler.java
@@ -29,7 +29,6 @@ public class ConfigHandler {
     public final File CONFIG_FILE = new File("config", "config.json");
     public final int CONFIG_VERSION = 1;
     public static File INSTALL_LOCATION;
-    public static String installLocation;
     private JSONObject jsonObject;
     private final Logger logger = LogManager.getLogger(this);
 
@@ -38,7 +37,7 @@ public ConfigHandler() {
         logger.info("Config version: " + jsonObject.getInt("version"));
         logger.info("showInvasionNotifications: " + showCogInvasionNotifications());
         logger.info("showFieldOfficeNotifications: " + showFieldOfficeNotifications());
-        logger.info("ttrInstallLocation: " + installLocation);
+        logger.info("ttrInstallLocation: " + INSTALL_LOCATION.getAbsolutePath());
     }
 
     public boolean showCogInvasionNotifications() {
@@ -96,7 +95,6 @@ public void loadConfig() {
             }
         }
         setDefaults();
-        installLocation = jsonObject.getString("ttrInstallLocation");
-        INSTALL_LOCATION = new File(installLocation);
+        INSTALL_LOCATION = new File(jsonObject.getString("ttrInstallLocation"));
     }
 }
diff --git a/src/main/java/lol/hyper/customlauncher/accounts/windows/ConfigWindow.java b/src/main/java/lol/hyper/customlauncher/accounts/windows/ConfigWindow.java
@@ -47,7 +47,7 @@ public ConfigWindow(ConfigHandler configHandler) {
         panel.setLayout(null);
 
         JLabel ttrInstall = new JLabel("<html>TTR Installation</html>");
-        JTextField ttrInstallBox = new JTextField(ConfigHandler.installLocation);
+        JTextField ttrInstallBox = new JTextField(ConfigHandler.INSTALL_LOCATION.getAbsolutePath());
         JLabel showInvasionNotifications = new JLabel("<html>Show invasion notifications?</html>");
         JCheckBox showInvasionNotificationsBox = new JCheckBox();
         JLabel showFieldOfficeNotifications =
diff --git a/src/main/java/lol/hyper/customlauncher/login/LaunchGame.java b/src/main/java/lol/hyper/customlauncher/login/LaunchGame.java
@@ -50,25 +50,38 @@ public void run() {
                 windowsCommand = new String[] {"cmd", "/c", "TTREngine.exe"};
             }
             pb.command(windowsCommand);
+            logger.info("Launching game from " + ConfigHandler.INSTALL_LOCATION);
         }
         if (SystemUtils.IS_OS_LINUX) {
             String linuxCommand = "./TTREngine";
 
             // Make sure it's executable before running
-            boolean result =
-                    new File(ConfigHandler.installLocation + linuxCommand).setExecutable(true);
+            boolean result;
+            File fullPath = new File(ConfigHandler.INSTALL_LOCATION, "TTREngine");
+            try {
+                result = fullPath.setExecutable(true);
+            } catch (SecurityException exception) {
+                logger.error(
+                        "Unable to set " + fullPath.getAbsolutePath() + " as an executable!",
+                        exception);
+                ErrorWindow errorWindow = new ErrorWindow(null, exception);
+                errorWindow.dispose();
+                return;
+            }
+
             if (!result) {
+                logger.error("Unable to set " + fullPath.getAbsolutePath() + " as an executable!");
                 ErrorWindow errorWindow =
                         new ErrorWindow(
                                 "Unable to set "
-                                        + ConfigHandler.installLocation
-                                        + "TTREngine as executable. Please make sure this file has the correct permissions!",
+                                        + fullPath.getAbsolutePath()
+                                        + " as an executable!\nMake sure this file is executable!",
                                 null);
                 errorWindow.dispose();
                 return;
             }
-
             pb.command(linuxCommand);
+            logger.info("Launching game from " + fullPath.getAbsolutePath());
         }
 
         // dirty little trick to redirect the output
@@ -82,8 +95,6 @@ public void run() {
         env.put("TTR_GAMESERVER", this.gameServer);
         env.put("TTR_PLAYCOOKIE", this.cookie);
 
-        logger.info("Launching game from " + ConfigHandler.installLocation);
-
         Thread t1 =
                 new Thread(
                         () -> {
diff --git a/src/main/java/lol/hyper/customlauncher/ttrupdater/TTRUpdater.java b/src/main/java/lol/hyper/customlauncher/ttrupdater/TTRUpdater.java
@@ -157,7 +157,7 @@ public TTRUpdater(String title) {
                 if (!localFile.exists()) {
                     logger.info(
                             "-----------------------------------------------------------------------");
-                    logger.info(ConfigHandler.installLocation + File.separator + key);
+                    logger.info(ConfigHandler.INSTALL_LOCATION.getAbsolutePath() + File.separator + key);
                     logger.info("This file is missing and will be downloaded.");
                     logger.info(
                             "-----------------------------------------------------------------------");
@@ -180,7 +180,7 @@ public TTRUpdater(String title) {
                 }
                 logger.info(
                         "-----------------------------------------------------------------------");
-                logger.info(ConfigHandler.installLocation + File.separator + key);
+                logger.info(ConfigHandler.INSTALL_LOCATION.getAbsolutePath() + File.separator + key);
                 logger.info("Local hash: " + localHash.toLowerCase(Locale.ENGLISH));
                 logger.info("Expected hash: " + onlineHash);
                 logger.info("Type: " + osType);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ public class ConfigHandler {`
`29`	`29`	`public final File CONFIG_FILE = new File("config", "config.json");`
`30`	`30`	`public final int CONFIG_VERSION = 1;`
`31`	`31`	`public static File INSTALL_LOCATION;`
`32`		`- public static String installLocation;`
`33`	`32`	`private JSONObject jsonObject;`
`34`	`33`	`private final Logger logger = LogManager.getLogger(this);`
`35`	`34`
`@@ -38,7 +37,7 @@ public ConfigHandler() {`
`38`	`37`	`logger.info("Config version: " + jsonObject.getInt("version"));`
`39`	`38`	`logger.info("showInvasionNotifications: " + showCogInvasionNotifications());`
`40`	`39`	`logger.info("showFieldOfficeNotifications: " + showFieldOfficeNotifications());`
`41`		`- logger.info("ttrInstallLocation: " + installLocation);`
	`40`	`+ logger.info("ttrInstallLocation: " + INSTALL_LOCATION.getAbsolutePath());`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`public boolean showCogInvasionNotifications() {`
`@@ -96,7 +95,6 @@ public void loadConfig() {`
`96`	`95`	`}`
`97`	`96`	`}`
`98`	`97`	`setDefaults();`
`99`		`- installLocation = jsonObject.getString("ttrInstallLocation");`
`100`		`- INSTALL_LOCATION = new File(installLocation);`
	`98`	`+ INSTALL_LOCATION = new File(jsonObject.getString("ttrInstallLocation"));`
`101`	`99`	`}`
`102`	`100`	`}`