README.md

@@ -5,7 +5,7 @@
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/hyperdefined/CustomLauncherRewrite) [![Downloads](https://img.shields.io/github/downloads/hyperdefined/CustomLauncherRewrite/total?logo=github)](https://github.com/hyperdefined/CustomLauncherRewrite/releases) [![badge](https://img.shields.io/badge/made%20with-love%20&%20fluff-red)](https://www.gnu.org/licenses/gpl-3.0) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![wakatime](https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/c164aaf8-23ad-4bbc-9807-44eb3db04263.svg)](https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/c164aaf8-23ad-4bbc-9807-44eb3db04263)
 </div>
 
-CustomLauncherRewrite is an all purpose launcher for Toontown Rewritten. This launcher is based on my old one, [Multitoon Helper](https://github.com/hyperdefined/multitoon-helper). This one is built from the ground up and includes many features!
+CustomLauncherRewrite is an all-purpose launcher for Toontown Rewritten. This launcher is based on my old one, [Multitoon Helper](https://github.com/hyperdefined/multitoon-helper). This one is built from the ground up and includes many features!
 
 ## Features
 ### Account Saving

linux/customlauncherrewrite.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Name=CustomLauncherRewrite
 Comment=An all purpose custom TTR launcher.
-Path=/opt/CustomLauncherRewrite
+Path={INSTALL_DIR}
 Icon=customlauncherrewrite-icon.png
 Exec=bash run.sh
 Terminal=false

linux/installer.sh

@@ -19,24 +19,28 @@
 # taken from https://gist.github.com/steinwaywhw/a4cd19cda655b8249d908261a62687f8
 DOWNLOADURL=$(curl -s https://api.github.com/repos/hyperdefined/CustomLauncherRewrite/releases/latest | grep "browser_download_url"  | grep "tar.gz" | cut -d '"' -f 4)
 OUTPUTFILE=${DOWNLOADURL##*/}
-INSTALLDIR=/opt/CustomLauncherRewrite #In case support for a custom install directory is added
 
 echo "Downloading latest version from ""$DOWNLOADURL"""
-
 wget -q -P /tmp/ "$DOWNLOADURL"
 
+echo "CustomLauncherRewrite will install itself to /opt/CustomLauncherRewrite by default. If you want to specify a different directory, enter one below."
+echo "If you want to leave it default, just press enter."
+read -r -p "Enter the installation directory (will create folder): " USER_INSTALLDIR < /dev/tty
+INSTALLDIR=${USER_INSTALLDIR:-/opt/CustomLauncherRewrite}
 echo "Creating $INSTALLDIR...".
-sudo mkdir -p $INSTALLDIR
+sudo mkdir -p "$INSTALLDIR"
+echo "$INSTALLDIR" > ~/.customlauncherrewrite-location
 
 echo "Extracting ""$OUTPUTFILE""..."
-sudo tar -xf /tmp/"$OUTPUTFILE" -C $INSTALLDIR
+sudo tar -xf /tmp/"$OUTPUTFILE" -C "$INSTALLDIR"
 
 echo "Downloading desktop entry..."
 # Create the icons directory just in case it doesn't exist
 # Save the icon for the launcher
 mkdir -p ~/.local/share/icons/
 wget -q -O ~/.local/share/icons/customlauncherrewrite-icon.png https://raw.githubusercontent.com/hyperdefined/CustomLauncherRewrite/master/src/main/resources/icon.png
 sudo wget -q -P /usr/share/applications https://raw.githubusercontent.com/hyperdefined/CustomLauncherRewrite/master/linux/customlauncherrewrite.desktop
+sudo sed -i "s|{INSTALL_DIR}|$INSTALLDIR|g" /usr/share/applications/customlauncherrewrite.desktop
 
 # Find the user's desktop
 if command -v xdg-user-dir >/dev/null 2>&1; then
@@ -48,15 +52,15 @@ fi
 
 # Symlink on desktop (e.g. desktop shortcut)
 ln -s /usr/share/applications/customlauncherrewrite.desktop "$DESKTOP_DIR/customlauncherrewrite.desktop"
-sudo chmod +x "$DESKTOP_DIR/customlauncherrewrite.desktop"
 sudo chown "$USER":"$USER" "$DESKTOP_DIR/customlauncherrewrite.desktop"
+chmod +x "$DESKTOP_DIR/customlauncherrewrite.desktop"
 
 # Make sure the user owns the folder to run
 echo "Setting correct perms to install location..."
-sudo chown -R "$USER":"$USER" $INSTALLDIR
-sudo chmod -R 755 $INSTALLDIR
+sudo chown -R "$USER":"$USER" "$INSTALLDIR"
+sudo chmod -R 755 "$INSTALLDIR"
 
 # Delete any temp files
 rm -rf /tmp/CustomLauncherRewrite*
 
-echo "CustomLauncherRewrite has been installed!"
+echo "CustomLauncherRewrite has been installed!"

linux/run.sh

@@ -19,7 +19,19 @@
 # Check if Java is installed and the version is at least 17
 if (( $(java -version 2>&1 | grep -Po '(?<=")[0-9]{2}') >= 17 )); then
     latest=$(find . -name "CustomLauncherRewrite-*.jar" -type f -printf "%T@ %p\n" | sort -nr | head -n1 | cut -d' ' -f2-)
-    java -jar "$latest"
+    java -jar "$latest" &
+    pid=$!
+
+    # This is only needed as I've see the jar run in the background and not get closed
+    cleanup() {
+        if kill -0 $pid 2>/dev/null; then
+            echo "Killing CustomLauncherRewrite for cleanup, process $pid"
+            kill $pid
+        fi
+    }
+
+    trap cleanup EXIT
+    wait $pid
 else
     if command -v notify-send &> /dev/null; then
         notify-send -i stop "CustomLauncherRewrite" "Please update Java JRE to version 17 or higher!"

linux/uninstaller.sh

@@ -16,27 +16,51 @@
 # along with CustomLauncherRewrite.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-read -r -p "Before we uninstall, would you like to keep your TTR files? These include screenshots and resource packs. Enter 'Y' to keep them, 'N' to wipe them.: " input
+read -r -p "Before we uninstall, would you like to keep your TTR files? These include screenshots and resource packs. Enter 'Y' to keep them, 'N' to wipe them.: " input < /dev/tty
+
+# Convert to uppercase
+input=$(echo "$input" | tr -d '[:space:]' | tr '[:lower:]' '[:upper:]')
 
 if [ "$input" != "Y" ]; then
   keep_ttr_files=false
 else
   keep_ttr_files=true
 fi
 
+# Read the install location
+INSTALL_DIR=$(head -n1 ~/.customlauncherrewrite-location)
+
+# Make sure the location is valid
+if [ -z "$INSTALL_DIR" ]; then
+  echo "Installation location cannot be determined! Using default..."
+  INSTALL_DIR="/opt/CustomLauncherRewrite"
+fi
+
+# Delete all files in the root of the install location
+sudo find "$INSTALL_DIR" -maxdepth 1 -type f -delete
+
 if $keep_ttr_files; then
-  echo "Removing /opt/CustomLauncherRewrite but keeping TTR files..."
-  # remove everything but ttr-files folder
-  sudo find /opt/CustomLauncherRewrite/* -type d -not -name 'ttr-files' -exec rm -rf {} +
-  sudo rm /opt/CustomLauncherRewrite/CustomLauncherRewrite*
-  sudo rm /opt/CustomLauncherRewrite/run.sh
-else 
-  echo "Removing /opt/CustomLauncherRewrite..."
-  sudo rm -r /opt/CustomLauncherRewrite
+  echo "Removing $INSTALL_DIR but keeping TTR files..."
+  # Remove all folders but ttr-files folder
+  sudo find "$INSTALL_DIR" -mindepth 1 -maxdepth 1 -type d -not -name "ttr-files" -exec rm -rf {} +
+else
+  # Remove the entire directory
+  echo "Removing $INSTALL_DIR..."
+  sudo rm -r "$INSTALL_DIR"
+fi
+
+# Find the user's desktop
+if command -v xdg-user-dir >/dev/null 2>&1; then
+    DESKTOP_DIR=$(xdg-user-dir DESKTOP)
+else
+    # If xdg-user-dir is not installed, just try to guess it
+    DESKTOP_DIR=~/Desktop
 fi
 
 echo "Removing the desktop entry..."
-sudo rm ~/Desktop/customlauncherrewrite.desktop
+sudo rm "$DESKTOP_DIR/customlauncherrewrite.desktop"
+rm ~/.local/share/icons/customlauncherrewrite-icon.png
 sudo rm /usr/share/applications/customlauncherrewrite.desktop
+rm ~/.customlauncherrewrite-location
 
-echo "CustomLauncherRewrite has been uninstalled!"
+echo "CustomLauncherRewrite has been uninstalled!"

pom.xml

@@ -23,19 +23,19 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>CustomLauncherRewrite</artifactId>
-    <version>1.9.2</version>
+    <version>1.9.3</version>
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>auto-clean</id>
@@ -49,7 +49,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -81,7 +81,7 @@
             <plugin>
                 <groupId>com.akathist.maven.plugins.launch4j</groupId>
                 <artifactId>launch4j-maven-plugin</artifactId>
-                <version>2.5.1</version>
+                <version>2.6.0</version>
                 <executions>
                     <execution>
                         <id>l4j-clui</id>
@@ -93,7 +93,7 @@
                             <headerType>gui</headerType>
                             <jar>${project.build.directory}/CustomLauncherRewrite-${project.version}.jar</jar>
                             <outfile>${project.build.directory}/CustomLauncherRewrite-${project.version}.exe</outfile>
-                            <downloadUrl>https://adoptium.net/releases.html?variant=openjdk17&amp;jvmVariant=hotspot
+                            <downloadUrl>https://adoptium.net/releases.html?variant=openjdk21&amp;jvmVariant=hotspot
                             </downloadUrl>
                             <icon>src/main/resources/icon.ico</icon>
                             <classPath>
@@ -150,42 +150,27 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20240303</version>
+            <version>20250517</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.16.1</version>
+            <version>2.20.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.26.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <version>5.3.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.27.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.23.1</version>
+            <version>2.25.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
+            <version>3.18.0</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -205,7 +190,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.1.0</version>
+            <version>26.0.2</version>
         </dependency>
     </dependencies>
 

src/main/java/lol/hyper/customlauncher/ConfigHandler.java

@@ -36,7 +36,7 @@ public class ConfigHandler {
     /**
      * The config version, used for detecting and changes.
      */
-    public final int CONFIG_VERSION = 1;
+    private final int CONFIG_VERSION = 1;
     /**
      * The config's content.
      */
@@ -151,7 +151,7 @@ public void loadConfig(boolean log) {
                 JSONUtils.writeFile(configJSON, CONFIG_FILE);
             }
             if (configJSON.getInt("version") != CONFIG_VERSION) {
-                logger.warn("Config version is not correct! Somethings will not work correctly. Version should be " + CONFIG_VERSION + " but read " + configJSON.getInt("version"));
+                logger.warn("Config version is not correct! Somethings will not work correctly. Version should be " + CONFIG_VERSION + " but read {}", configJSON.getInt("version"));
             }
         }
         setDefaults();
@@ -163,7 +163,7 @@ public void loadConfig(boolean log) {
         if (!(installPath.exists())) {
             try {
                 Files.createDirectory(installPath.toPath());
-                logger.info("Creating TTR install folder at " + installPath);
+                logger.info("Creating TTR install folder at {}", installPath);
                 new FirstLaunch();
             } catch (IOException exception) {
                 logger.error("Cannot create TTR folder!", exception);
@@ -172,10 +172,10 @@ public void loadConfig(boolean log) {
         }
 
         if (log) {
-            logger.info("Config version: " + configJSON.getInt("version"));
-            logger.info("showInvasionNotifications: " + invasionNotifications);
-            logger.info("showFieldOfficeNotifications: " + fieldOfficeNotifications);
-            logger.info("ttrInstallLocation: " + installPath.getAbsolutePath());
+            logger.info("Config version: {}", configJSON.getInt("version"));
+            logger.info("showInvasionNotifications: {}", invasionNotifications);
+            logger.info("showFieldOfficeNotifications: {}", fieldOfficeNotifications);
+            logger.info("ttrInstallLocation: {}", installPath.getAbsolutePath());
         }
     }
 }