From e9f07f96b81b2624fef12c6cdbe285e390e09367 Mon Sep 17 00:00:00 2001 From: Links2004 Date: Wed, 13 Dec 2023 19:51:14 +0100 Subject: [PATCH] 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: https://github.com/SlimeVR/SlimeVR-OpenVR-Driver/issues/43 --- .../core/src/main/java/io/eiren/util/OperatingSystem.kt | 8 +++++--- server/desktop/src/main/java/dev/slimevr/desktop/Main.kt | 4 ++-- 2 files changed, 7 insertions(+), 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 index bea73f5df4..0b0a66fd70 100644 --- 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 index dd423eb65f..4e1fc1d40a 100644 --- 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() )