Open
Conversation
Co-authored-by: Sapphire <imsapphire0@gmail.com>
Co-authored-by: Sapphire <imsapphire0@gmail.com>
… into llelievr/electron
loucass003
reviewed
Mar 10, 2026
loucass003
reviewed
Mar 10, 2026
loucass003
reviewed
Mar 10, 2026
server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt
Outdated
Show resolved
Hide resolved
loucass003
reviewed
Mar 10, 2026
loucass003
requested changes
Mar 10, 2026
loucass003
reviewed
Mar 10, 2026
server/desktop/src/main/java/dev/slimevr/desktop/install/drivers/Windows.kt
Outdated
Show resolved
Hide resolved
loucass003
reviewed
Mar 10, 2026
loucass003
reviewed
Mar 10, 2026
server/desktop/src/main/java/dev/slimevr/desktop/games/vrchat/RegEdit.kt
Outdated
Show resolved
Hide resolved
loucass003
reviewed
Mar 10, 2026
server/desktop/src/main/java/dev/slimevr/desktop/games/vrchat/RegEdit.kt
Outdated
Show resolved
Hide resolved
ImSapphire
requested changes
Mar 11, 2026
server/desktop/src/main/java/dev/slimevr/desktop/install/drivers/Windows.kt
Outdated
Show resolved
Hide resolved
server/desktop/src/main/java/dev/slimevr/desktop/games/vrchat/RegEdit.kt
Outdated
Show resolved
Hide resolved
server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt
Outdated
Show resolved
Hide resolved
ImSapphire
reviewed
Mar 16, 2026
server/desktop/src/main/java/dev/slimevr/desktop/install/drivers/Linux.kt
Outdated
Show resolved
Hide resolved
server/desktop/src/main/java/dev/slimevr/desktop/install/drivers/Linux.kt
Outdated
Show resolved
Hide resolved
Comment on lines
+41
to
+53
| val isPressureVessel = System.getenv("PRESSURE_VESSEL_RUNTIME")?.isNotEmpty() | ||
| val dir = if (isPressureVessel == true) { | ||
| val user = System.getenv("USER") | ||
| "/home/$user/.local/share/dev.slimevr.SlimeVR" | ||
| } else { | ||
| val runtimeDir = System.getenv("XDG_RUNTIME_DIR") | ||
| if (!runtimeDir.isNullOrBlank()) { | ||
| runtimeDir | ||
| } else { | ||
| System.getProperty("java.io.tmpdir") | ||
| } | ||
| } | ||
| return dir |
Member
There was a problem hiding this comment.
The dir variable here is unnecessary, you can just have return statements in the branches
We also cannot assume data home is at /home/$USER/.local/share. See resolveLogDirectory on how to properly handle this
ImSapphire
reviewed
Mar 16, 2026
Comment on lines
+387
to
+397
| const serverArgs = ['-Xmx128M', '-jar', serverJar] | ||
|
|
||
| const process = spawn(javaBin, ['-Xmx128M', '-jar', serverJar, 'run']); | ||
| if (options.steam) serverArgs.push(`--steam=${options.steam}`) | ||
| if (options.install) serverArgs.push(`--install=${options.install}`) | ||
| if (options.noUdev) serverArgs.push(`--no-udev`) | ||
|
|
||
| serverArgs.push('run') | ||
|
|
||
| const process = spawn(javaBin, serverArgs) | ||
|
|
||
| logger.info(`Java start command: ${serverArgs.join(' ')})`) |
Member
There was a problem hiding this comment.
Suggested change
| const serverArgs = ['-Xmx128M', '-jar', serverJar] | |
| const process = spawn(javaBin, ['-Xmx128M', '-jar', serverJar, 'run']); | |
| if (options.steam) serverArgs.push(`--steam=${options.steam}`) | |
| if (options.install) serverArgs.push(`--install=${options.install}`) | |
| if (options.noUdev) serverArgs.push(`--no-udev`) | |
| serverArgs.push('run') | |
| const process = spawn(javaBin, serverArgs) | |
| logger.info(`Java start command: ${serverArgs.join(' ')})`) | |
| const serverArgs = ['-Xmx128M', '-jar', serverJar]; | |
| if (options.steam) serverArgs.push('--steam'); | |
| if (options.install) serverArgs.push('--install'); | |
| if (options.noUdev) serverArgs.push('--no-udev'); | |
| serverArgs.push('run'); | |
| logger.info({ serverArgs }, 'Server command-line arguments'); | |
| const process = spawn(javaBin, serverArgs); |
| val parser: CommandLineParser = DefaultParser() | ||
| val formatter = HelpFormatter() | ||
| val options = Options() | ||
| val isLinux = System.getProperty("os.name").lowercase().contains("linux") |
Member
There was a problem hiding this comment.
Suggested change
| val isLinux = System.getProperty("os.name").lowercase().contains("linux") | |
| val isLinux = OperatingSystem.currentPlatform == OperatingSystem.LINUX |
Comment on lines
+38
to
+51
| val dir = System.getenv("SLIMEVR_SOCKET_DIR") | ||
| if (dir != null) return dir | ||
| if (currentPlatform == LINUX) { | ||
| dir = System.getenv("XDG_RUNTIME_DIR") | ||
| if (dir != null) return dir | ||
| val isPressureVessel = System.getenv("PRESSURE_VESSEL_RUNTIME")?.isNotEmpty() | ||
| if (isPressureVessel == true) { | ||
| System.getenv("HOME")?.let { Path(it, ".local", "share", "dev.slimevr.SlimeVR") } | ||
| } else { | ||
| val runtimeDir = System.getenv("XDG_RUNTIME_DIR") | ||
| return if (!runtimeDir.isNullOrBlank()) { | ||
| runtimeDir | ||
| } else { | ||
| System.getProperty("java.io.tmpdir") | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
I feel like the previous way of re-assigning to dir is more readable. There's also a missing return statement, and XDG_DATA_HOME is not being handled
Suggested change
| val dir = System.getenv("SLIMEVR_SOCKET_DIR") | |
| if (dir != null) return dir | |
| if (currentPlatform == LINUX) { | |
| dir = System.getenv("XDG_RUNTIME_DIR") | |
| if (dir != null) return dir | |
| val isPressureVessel = System.getenv("PRESSURE_VESSEL_RUNTIME")?.isNotEmpty() | |
| if (isPressureVessel == true) { | |
| System.getenv("HOME")?.let { Path(it, ".local", "share", "dev.slimevr.SlimeVR") } | |
| } else { | |
| val runtimeDir = System.getenv("XDG_RUNTIME_DIR") | |
| return if (!runtimeDir.isNullOrBlank()) { | |
| runtimeDir | |
| } else { | |
| System.getProperty("java.io.tmpdir") | |
| } | |
| } | |
| var dir = System.getenv("SLIMEVR_SOCKET_DIR") | |
| if (dir != null) return dir | |
| if (currentPlatform == LINUX) { | |
| val isPressureVessel = System.getenv("PRESSURE_VESSEL_RUNTIME")?.isNotEmpty() == true | |
| if (isPressureVessel) { | |
| dir = System.getenv("XDG_DATA_HOME")?.let { Path(it, CONFIG_IDENTIFIER) } | |
| ?: System.getenv("HOME")?.let { Path(it, ".local", "share", CONFIG_IDENTIFIER) } | |
| if (dir != null) return dir | |
| } | |
| dir = System.getenv("XDG_RUNTIME_DIR") | |
| if (dir != null) return dir |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pr contains changes needed for the steam release to run.
Changes include:
This PR relies on this PR from solarXR SlimeVR/SolarXR-Protocol#198