allow to set the socket dir via SLIMEVR_SOCKET_DIR

this is needed if the vrserver is running in a chroot env and we need to mount the sockets to the HOME dir. see: SlimeVR/SlimeVR-OpenVR-Driver#43
Links2004 · Dec 13, 2023 · e9f07f9 · e9f07f9
1 parent c3c7fc8
commit e9f07f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/server/core/src/main/java/io/eiren/util/OperatingSystem.kt b/server/core/src/main/java/io/eiren/util/OperatingSystem.kt
@@ -32,11 +32,13 @@ enum class OperatingSystem(
 			}
 		}
 
-		val tempDirectory: String
+		val socketDirectory: String
 			get() {
+				var dir = System.getenv("SLIMEVR_SOCKET_DIR")
+				if (dir != null) return dir
 				if (currentPlatform == LINUX) {
-					val tmp = System.getenv("XDG_RUNTIME_DIR")
-					if (tmp != null) return tmp
+					dir = System.getenv("XDG_RUNTIME_DIR")
+					if (dir != null) return dir
 				}
 				return System.getProperty("java.io.tmpdir")
 			}

diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt
@@ -164,7 +164,7 @@ fun provideSteamVRBridge(
 				server,
 				"steamvr",
 				"SteamVR Driver Bridge",
-				Paths.get(OperatingSystem.tempDirectory, "SlimeVRDriver")
+				Paths.get(OperatingSystem.socketDirectory, "SlimeVRDriver")
 					.toString(),
 				computedTrackers
 			)
@@ -214,7 +214,7 @@ fun provideFeederBridge(
 				server,
 				"steamvr_feeder",
 				"SteamVR Feeder Bridge",
-				Paths.get(OperatingSystem.tempDirectory, "SlimeVRInput")
+				Paths.get(OperatingSystem.socketDirectory, "SlimeVRInput")
 					.toString(),
 				FastList()
 			)