修正无法运行Java的错误

EricTianC · Feb 17, 2021 · 0bfc0be · 0bfc0be
1 parent 78b1733
commit 0bfc0be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/checkJRE.go b/checkJRE.go
@@ -46,12 +46,12 @@ func checkJavaBin() bool {
 	case "macos":
 		matches, err := filepath.Glob("./jre/*/Contents/Home/bin/*")
 		if err == nil && len(matches) != 0 {
-			javaPath, _ = filepath.Split(matches[0])
+			javaPath = filepath.Dir(matches[0])
 		}
 	default:
 		matches, err := filepath.Glob("./jre/*/bin/*")
 		if err == nil && len(matches) != 0 {
-			javaPath, _ = filepath.Split(matches[0])
+			javaPath = filepath.Dir(matches[0])
 		}
 
 	}

diff --git a/check_mcl.go b/check_mcl.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 )
 
@@ -48,7 +49,7 @@ func download_mcl() {
 
 func first_run_mcl() {
 	args := append(MCL_BASE_ARG, os.Args...)
-	cmd := exec.Command(javaPath+JAVA, args...)
+	cmd := exec.Command(filepath.Join(javaPath, JAVA), args...)
 	cmd.Stdin = os.Stdin
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
@@ -62,7 +63,7 @@ func first_run_mcl() {
 	go wait_first_complete(stdout)
 	cmd.Wait()
 	args = append(MCL_BASE_ARG, "--update-package net.mamoe:mirai-api-http --channel stable --type plugin")
-	cmd = exec.Command(javaPath+JAVA, args...)
+	cmd = exec.Command(filepath.Join(javaPath, JAVA), args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

diff --git a/main.go b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 	"os/exec"
+	"path/filepath"
 )
 
 var javaPath string
@@ -12,7 +13,7 @@ func main() {
 	check_mcl()
 	args := []string{"-jar", "mcl.jar"}
 	args = append(args, os.Args...)
-	cmd := exec.Command(javaPath+JAVA, args...)
+	cmd := exec.Command(filepath.Join(javaPath, JAVA), args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr