Conversation
…r for querying versions
…nstall-from-server
…nstall-from-server
…nstall-from-server
…nstall-from-server
…they're not found
|
I changed the base of the PR so the diff makes more sense |
| ( | ||
| ( | ||
| ( | ||
| contentLength?.toFloat() | ||
| ?: 1f | ||
| ) | ||
| ) | ||
| ) | ||
| ) |
There was a problem hiding this comment.
Intellij format suggestion iirc.
| var response = false | ||
| if (udevResponse.contains("slime")) { | ||
| response = true | ||
| } | ||
| else { | ||
| response = false | ||
| } |
There was a problem hiding this comment.
Can probably be more succinctly represented:
| var response = false | |
| if (udevResponse.contains("slime")) { | |
| response = true | |
| } | |
| else { | |
| response = false | |
| } | |
| val response = udevResponse.contains("slime") |
|
|
||
| if (os.contains("linux")) { | ||
| val linuxUpdater = Linux() | ||
| val linuxFlavour = executeShellCommand("uname", "-n") |
| private fun executeShellCommand(vararg command: String): String = try { | ||
| val process = ProcessBuilder(*command) | ||
| .redirectErrorStream(true) | ||
| .start() | ||
| process.inputStream.bufferedReader().readText().also { | ||
| process.waitFor() | ||
| } | ||
| } catch (e: IOException) { | ||
| LogManager.warning("Error executing shell command: ${e.message}") | ||
| "Error executing shell command: ${e.message}" | ||
| } |
There was a problem hiding this comment.
duplicated from InstallerUtils
There was a problem hiding this comment.
Yeah, that's because it's still wip and I haven't decided on where I will put it.
| return | ||
| } | ||
| val vrPathRegContents = executeShellCommand("${steamVRLocation}\\bin\\win64\\vrpathreg.exe", "finddriver", "slimevr") | ||
| val isDriverRegistered = vrPathRegContents.contains("WINDOWSSTEAMVRDRIVERDIRECTORY") |
There was a problem hiding this comment.
| val isDriverRegistered = vrPathRegContents.contains("WINDOWSSTEAMVRDRIVERDIRECTORY") | |
| val isDriverRegistered = vrPathRegContents.contains(WINDOWSSTEAMVRDRIVERDIRECTORY) |
There was a problem hiding this comment.
Also seems to have been reverted accidentally
There was a problem hiding this comment.
Also seems to have been reverted accidentally
| private const val LINUXSTEAMVRDRIVERURL = "https://github.com/SlimeVR/SlimeVR-OpenVR-Driver/releases/latest/download/slimevr-openvr-driver-x64-linux.zip" | ||
| private const val LINUXSTEAMVRDRIVERNAME = "slimevr-openvr-driver-x64-linux.zip" | ||
| private const val LINUXSTEAMVRDRIVERDIRECTORY = "slimevr-openvr-driver-x64-linux" | ||
| private const val LINUXFEEDERURL = "https://github.com/SlimeVR/SlimeVR-Feeder-App/releases/latest/download/SlimeVR-Feeder-App-Linux.zip" | ||
| private const val LINUXFEEDERNAME = "SlimeVR-Feeder-App-Linux.zip" | ||
| private const val LINUXFEEDERDIRECTORY = "SlimeVR-Feeder-App-Linux" | ||
| private const val LINUXSERVERURL = "https://github.com/SlimeVR/SlimeVR-Server/releases/latest/download/SlimeVR-amd64.appimage" | ||
| private const val LINUXSERVERNAME = "SlimeVR-amd64.appimage" | ||
| private const val LINUXSERVERDIRECTORY = "slimevr-linux" |
There was a problem hiding this comment.
These should be screaming snake case
updater/desktop/src/main/java/dev/slimevr/updater/UpdaterUtils.kt
Outdated
Show resolved
Hide resolved
| private const val WINDOWSSTEAMVRDRIVERURL = "https://github.com/SlimeVR/SlimeVR-OpenVR-Driver/releases/latest/download/slimevr-openvr-driver-win64.zip" | ||
| private const val WINDOWSSTEAMVRDRIVERNAME = "slimevr-openvr-driver-win64.zip" | ||
| private const val WINDOWSSTEAMVRDRIVERDIRECTORY = "slimevr-openvr-driver-win64" | ||
| private const val WINDOWSFEEDERURL = "https://github.com/SlimeVR/SlimeVR-Feeder-App/releases/latest/download/SlimeVR-Feeder-App-win64.zip" | ||
| private const val WINDOWSFEEDERNAME = "SlimeVR-Feeder-App-win64.zip" | ||
| private const val WINDOWSFEEDERDIRECTORY = "SlimeVR-Feeder-App-win64" | ||
| private const val WINDOWSSERVERURL = "https://github.com/SlimeVR/SlimeVR-Server/releases/latest/download/SlimeVR-win64.zip" | ||
| private const val WINDOWSSERVERNAME = "slimevr-win64.zip" | ||
| private const val WINDOWSSERVERDIRECTORY = "slimevr-win64" |
There was a problem hiding this comment.
These should be screaming snake case
|
It seems the reverts happened in commit cb39890 |
Co-authored-by: Sapphire <imsapphire0@gmail.com>
Still Work in Progress.
Install from server is a system to have SlimeVR server install itself (kinda like how discord does it). It can also send information about the current installation to the gui to inform the user about uninstalled components or misconfigured components.
This commit relies on this PR from SolarXR: SlimeVR/SolarXR-Protocol#198