PR feedback and fix broken merge

gradle.properties

@@ -20,4 +20,3 @@ buildconfigVersion=6.0.7
 # We should probably stop using grgit, see:
 # https://andrewoberstar.com/posts/2024-04-02-dont-commit-to-grgit/
 grgitVersion=5.3.3
-ktor_version=3.0.3

gui/src/components/TopBar.tsx

@@ -38,7 +38,6 @@ export function VersionTag() {
       onClick={() => {
         const url = `https://github.com/${GH_REPO}/releases`;
         openUrl(url);
-        openUrl(url);
       }}
     >
       {(__VERSION_TAG__ || __COMMIT_HASH__) + (__GIT_CLEAN__ ? '' : '-dirty')}
@@ -95,8 +94,6 @@ export function TopBar({
     }
   };
 
-  // useEffect(() => {
-  //   if (!electron.isElectron) return;
   // useEffect(() => {
   //   if (!electron.isElectron) return;
 

server/core/src/main/java/dev/slimevr/FeatureFlags.kt

@@ -3,7 +3,5 @@ package dev.slimevr
 data class FeatureFlags(
 	var steam: Boolean = false,
 	var steamArgs: String = "",
-	var installer: Boolean = false,
-	var installerArgs: String = "",
 	var skipCheckUdev: Boolean = false,
 )

server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt

@@ -45,6 +45,6 @@ private fun executeShellCommand(vararg command: String): String? = try {
 		process.waitFor()
 	}
 } catch (e: IOException) {
-	LogManager.warning("Error executing shell command: ${e.message}")
+	LogManager.warning("Error executing shell command", e)
 	null
 }

server/desktop/build.gradle.kts

@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	kotlin("jvm")
-	kotlin("plugin.serialization") version "2.3.10"
 	application
 	id("com.gradleup.shadow")
 	id("com.github.gmazzo.buildconfig")
@@ -68,10 +67,6 @@ dependencies {
 		exclude(group = "com.fazecast", module = "android")
 	}
 	implementation("org.hid4java:hid4java:0.8.0")
-	implementation("io.ktor:ktor-client-core:3.0.3")
-	implementation("io.ktor:ktor-client-cio:3.0.3")
-	implementation("io.ktor:ktor-client-content-negotiation:3.0.3")
-	implementation("io.ktor:ktor-serialization-kotlinx-json:3.0.3")
 }
 
 tasks.shadowJar {

server/desktop/src/main/java/dev/slimevr/desktop/Main.kt

@@ -52,17 +52,14 @@ fun main(args: Array<String>) {
 	val parser: CommandLineParser = DefaultParser()
 	val formatter = HelpFormatter()
 	val options = Options()
+	val isLinux = System.getProperty("os.name").lowercase().contains("linux")
+	val featureFlags = FeatureFlags()
 	options.addOption("h", "help", false, "Show help")
 	options.addOption("V", "version", false, "Show version")
 	options.addOption("i", "install", true, "Run the driver install")
 	options.addOption("s", "steam", true, "Run the server in steam mode")
-
-	val isLinux = System.getProperty("os.name").lowercase().contains("linux")
-	val featureFlags = FeatureFlags()
 	if (isLinux) {
-		options.addOption("u", "no-udev", false, "Skip the checking of installed udev rules")
-	} else {
-		featureFlags.skipCheckUdev = true
+		options.addOption("u", "no-udev", false, "Skip checking if udev rules are installed")
 	}
 
 	val cmd: CommandLine = try {
@@ -71,7 +68,6 @@ fun main(args: Array<String>) {
 		formatter.printHelp("slimevr.jar", options)
 		exitProcess(1)
 	}
-	LogManager.info("Parsing options")
 	if (cmd.hasOption("help")) {
 		formatter.printHelp("slimevr.jar", options)
 		exitProcess(0)
@@ -81,8 +77,6 @@ fun main(args: Array<String>) {
 		exitProcess(0)
 	}
 	if (cmd.hasOption("install")) {
-		featureFlags.installer = true
-		featureFlags.installerArgs = cmd.getOptionValue("install")
 		val installDrivers = InstallDrivers()
 		installDrivers.runInstaller()
 		exitProcess(0)
@@ -91,11 +85,7 @@ fun main(args: Array<String>) {
 		featureFlags.steam = true
 		featureFlags.steamArgs = cmd.getOptionValue("steam")
 	}
-	if (isLinux) {
-		if (cmd.hasOption("no-udev")) {
-			featureFlags.skipCheckUdev = true
-		}
-	}
+	featureFlags.skipCheckUdev = !isLinux || cmd.hasOption("no-udev")
 
 	if (cmd.args.isEmpty()) {
 		System.err.println("No command specified, expected 'run'")
@@ -169,7 +159,6 @@ fun main(args: Array<String>) {
 			configManager = configManager,
 		)
 		vrServer.start()
-		LogManager.info("udev ${featureFlags.skipCheckUdev}, steam ${featureFlags.steam}")
 		// Start service for USB HID trackers
 		DesktopHIDManager(
 			"Sensors HID service",