From a3e54b4e09a25247d4ae22092079b50b63bff506 Mon Sep 17 00:00:00 2001 From: Uriel Date: Tue, 7 May 2024 00:53:02 -0300 Subject: [PATCH 1/3] Use the domain name of SlimeVR for socket folder --- src/bridge/bridge-unix-sockets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bridge/bridge-unix-sockets.cpp b/src/bridge/bridge-unix-sockets.cpp index 8a78bc3..f0e2113 100644 --- a/src/bridge/bridge-unix-sockets.cpp +++ b/src/bridge/bridge-unix-sockets.cpp @@ -34,7 +34,7 @@ #define TMP_DIR "/tmp" #define XDG_DATA_DIR_DEFAULT ".local/share" -#define SLIMEVR_DATA_DIR "slimevr" +#define SLIMEVR_DATA_DIR "dev.slimevr.SlimeVR" #define SOCKET_NAME "SlimeVRDriver" namespace fs = std::filesystem; From 4983b03effbe13937f80fb7fd17373af5f1579a2 Mon Sep 17 00:00:00 2001 From: Uriel Date: Tue, 24 Sep 2024 16:58:28 +0200 Subject: [PATCH 2/3] `XDG_DATA_DIR` doesnt exist --- src/bridge/bridge-unix-sockets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bridge/bridge-unix-sockets.cpp b/src/bridge/bridge-unix-sockets.cpp index f0e2113..e75ce2d 100644 --- a/src/bridge/bridge-unix-sockets.cpp +++ b/src/bridge/bridge-unix-sockets.cpp @@ -33,7 +33,7 @@ #include #define TMP_DIR "/tmp" -#define XDG_DATA_DIR_DEFAULT ".local/share" +#define XDG_DATA_HOME_DEFAULT ".local/share" #define SLIMEVR_DATA_DIR "dev.slimevr.SlimeVR" #define SOCKET_NAME "SlimeVRDriver" @@ -169,7 +169,7 @@ BridgeStatus runBridgeFrame(SlimeVRDriver::VRDriver& driver) { } // try using home dir if the vrserver is run in a chroot like if(!fs::exists(socket)) { - if (const char* ptr = std::getenv("XDG_DATA_DIR")) { + if (const char* ptr = std::getenv("XDG_DATA_HOME")) { const fs::path data_dir = ptr; socket = (data_dir / SLIMEVR_DATA_DIR / SOCKET_NAME); } else if (const char* ptr = std::getenv("HOME")) { From f5155ec21c5c059b6efcf10b9ab11994c0ecef20 Mon Sep 17 00:00:00 2001 From: Uriel Date: Tue, 24 Sep 2024 17:00:27 +0200 Subject: [PATCH 3/3] oopsie --- src/bridge/bridge-unix-sockets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bridge/bridge-unix-sockets.cpp b/src/bridge/bridge-unix-sockets.cpp index e75ce2d..7cd67ec 100644 --- a/src/bridge/bridge-unix-sockets.cpp +++ b/src/bridge/bridge-unix-sockets.cpp @@ -174,7 +174,7 @@ BridgeStatus runBridgeFrame(SlimeVRDriver::VRDriver& driver) { socket = (data_dir / SLIMEVR_DATA_DIR / SOCKET_NAME); } else if (const char* ptr = std::getenv("HOME")) { const fs::path home = ptr; - socket = (home / XDG_DATA_DIR_DEFAULT / SLIMEVR_DATA_DIR / SOCKET_NAME); + socket = (home / XDG_DATA_HOME_DEFAULT / SLIMEVR_DATA_DIR / SOCKET_NAME); } } if(fs::exists(socket)) {