From 7f75f4a44cd5af7f069b2a37261ba685dddb78ca Mon Sep 17 00:00:00 2001 From: Markus <974709+Links2004@users.noreply.github.com> Date: Fri, 16 Feb 2024 01:33:55 +0100 Subject: [PATCH] allow to set the socket dir via SLIMEVR_SOCKET_DIR (#909) --- .../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 bea73f5df..0b0a66fd7 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 a78a9cf6a..dbfcc1a2f 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt @@ -171,7 +171,7 @@ fun provideSteamVRBridge( server, "steamvr", "SteamVR Driver Bridge", - Paths.get(OperatingSystem.tempDirectory, "SlimeVRDriver") + Paths.get(OperatingSystem.socketDirectory, "SlimeVRDriver") .toString(), computedTrackers ) @@ -221,7 +221,7 @@ fun provideFeederBridge( server, "steamvr_feeder", "SteamVR Feeder Bridge", - Paths.get(OperatingSystem.tempDirectory, "SlimeVRInput") + Paths.get(OperatingSystem.socketDirectory, "SlimeVRInput") .toString(), FastList() )