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

Require the use of run command for running server (#701)

Browse Source 
Co-authored-by: Butterscotch! <bscotchvanilla@gmail.com>
This commit is contained in:
Uriel
2023-05-29 13:06:09 -03:00
committed by GitHub
parent 797fcab208
commit d1cd7776f3
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src-tauri/src/main.rs
View File

@@ -96,7 +96,7 @@ fn main() {
log::info!("Using Java binary: {:?}", java_bin);
let (recv, child) = Command::new(java_bin.to_str().unwrap())
.current_dir(p)
.args(["-Xmx512M", "-jar", "slimevr.jar", "--no-gui"])
.args(["-Xmx512M", "-jar", "slimevr.jar", "run"])
.spawn()
.expect("Unable to start the server jar");
backend = Some(child);

5
server/build.gradle.kts
View File

@@ -189,4 +189,7 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
}
}
tasks.getByName("run", JavaExec::class) { standardInput = System.`in` }
tasks.getByName("run", JavaExec::class) {
standardInput = System.`in`
args = listOf("run")
}

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

@@ -7,7 +7,6 @@ import org.apache.commons.cli.CommandLine
import org.apache.commons.cli.CommandLineParser
import org.apache.commons.cli.DefaultParser
import org.apache.commons.cli.HelpFormatter
import org.apache.commons.cli.Option
import org.apache.commons.cli.Options
import org.apache.commons.lang3.SystemUtils
import java.io.File
@@ -31,16 +30,15 @@ fun main(args: Array<String>) {
val parser: CommandLineParser = DefaultParser()
val formatter = HelpFormatter()
val options = Options()
val help = Option("h", "help", false, "Show help")
val version = Option("V", "version", false, "Show version")
options.addOption(help)
options.addOption(version)
options.addOption("h", "help", false, "Show help")
options.addOption("V", "version", false, "Show version")
val cmd: CommandLine = try {
parser.parse(options, args, true)
} catch (e: org.apache.commons.cli.ParseException) {
formatter.printHelp("slimevr.jar", options)
exitProcess(1)
}
if (cmd.hasOption("help")) {
formatter.printHelp("slimevr.jar", options)
exitProcess(0)
@@ -49,6 +47,16 @@ fun main(args: Array<String>) {
println("SlimeVR Server $VERSION")
exitProcess(0)
}
if (cmd.args.isEmpty()) {
System.err.println("No command specified, expected 'run'")
exitProcess(1)
}
if (!cmd.args[0].equals("run", true)) {
System.err.println("Unknown command: ${cmd.args[0]}, expected 'run'")
exitProcess(1)
}
val dir = File("").absoluteFile
try {
LogManager.initialize(dir)