github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 161 Packages Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
HannahPadd
2026-03-10 22:53:55 +01:00
parent 6da2691f2b
commit b2aa3ab394
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/electron/main/index.ts
View File

@@ -365,9 +365,17 @@ const spawnServer = async () => {
logger.info(options)
logger.info(`Java start command: ${['-Xmx128M', '-jar', serverJar, (options.steam ? [`--steam=${options.steam}`] : [undefined]), ...(options.install ? [`--install=${options.install}`] : []), ...(options.noUdev ? [`--no-udev`] : []), 'run']}`)
const serverArgs = ['-Xmx128M', '-jar', serverJar]
const process = spawn(javaBin, ['-Xmx128M', '-jar', serverJar, ...(options.steam ? [`--steam=${options.steam}`] : []), ...(options.install ? [`--install=${options.install}`] : []), ...(options.noUdev ? ['--no-udev'] : []), 'run']);
if (options.steam) serverArgs.push(`--steam=${options.steam}`)
if (options.install) serverArgs.push(`--install=${options.install}`)
if (options.noUdev) serverArgs.push(`--no-udev=${options.noUdev}`)
serverArgs.push('run')
logger.info(`Java start command: ${serverArgs.join(' ')})`)
const process = spawn(javaBin, serverArgs)
process.stdout?.on('data', (message) => {
mainWindow?.webContents.send(IPC_CHANNELS.SERVER_STATUS, {

1
server/core/src/main/java/dev/slimevr/VRServer.kt
View File

@@ -85,7 +85,6 @@ class VRServer @JvmOverloads constructor(
val deviceManager: DeviceManager
// UwU
@JvmField
val featureFlags: FeatureFlags = featureFlagsProvider(this)
@JvmField

5
server/core/src/main/java/dev/slimevr/protocol/rpc/installinfo/RPCInstallInfoHandler.kt
View File

@@ -18,7 +18,9 @@ class RPCInstallInfoHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) {
}
fun onInstalledInfoRequest(conn: GenericConnection, messageHeader: RpcMessageHeader?) {
if (!api.server.featureFlags.skipCheckUdev) {
if (api.server.featureFlags.skipCheckUdev) {
return
}
val udevResponse = executeShellCommand("udevadm", "cat")
if (udevResponse == null) {
LogManager.warning("Server couldn't verify if udev is installed")
@@ -35,7 +37,6 @@ class RPCInstallInfoHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) {
conn.send(fbb.dataBuffer())
}
}
}
private fun executeShellCommand(vararg command: String): String? = try {
val process = ProcessBuilder(*command)

2
server/desktop/src/main/java/dev/slimevr/desktop/Main.kt
View File

@@ -45,11 +45,11 @@ val VERSION =
(GIT_VERSION_TAG.ifEmpty { GIT_COMMIT_HASH }) +
if (GIT_CLEAN) "" else "-dirty"
val featureFlags = FeatureFlags()
fun main(args: Array<String>) {
System.setProperty("awt.useSystemAAFontSettings", "on")
System.setProperty("swing.aatext", "true")
val featureFlags = FeatureFlags()
val parser: CommandLineParser = DefaultParser()
val formatter = HelpFormatter()