Merge pull request #465 from Coder-Huangzejia/fix-envcheck-error

fix: 修复了在启动agent服务检测环境时，如果项目路径或者相关依赖路径名称存在空格，则会报错的问题
SonicCloudOrg · Sep 14, 2024 · 02a5667 · 02a5667
2 parents ca62705 + f829f8d
commit 02a5667
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/org/cloud/sonic/agent/tools/EnvCheckTool.java b/src/main/java/org/cloud/sonic/agent/tools/EnvCheckTool.java
@@ -136,7 +136,7 @@ private boolean checkADB() {
             adb.setExecutable(true);
             adb.setWritable(true);
             adb.setReadable(true);
-            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s version", adb.getAbsolutePath()));
+            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("\"%s\" version", adb.getAbsolutePath()));
             if (ver.size() == 0) {
                 printFail(type);
                 throw new RuntimeException("Can not use adb! Please ensure that `adb` command useful!" + (system.toUpperCase(Locale.ROOT).contains("MAC") ? " You can see " + HELP_URL + " ." : ""));
@@ -163,7 +163,7 @@ private boolean checkSAS() {
             sasBinary.setExecutable(true);
             sasBinary.setWritable(true);
             sasBinary.setReadable(true);
-            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s version", sasBinary.getAbsolutePath()));
+            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("\"%s\" version", sasBinary.getAbsolutePath()));
             sasPrintVersion = (ver.size() == 0 ? "null" : ver.get(0));
             if (ver.size() == 0 || !BytesTool.versionCheck(sasVersion, ver.get(0))) {
                 printFail(type);
@@ -190,7 +190,7 @@ private boolean checkSIB() {
             sibBinary.setExecutable(true);
             sibBinary.setWritable(true);
             sibBinary.setReadable(true);
-            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s version", sibBinary.getAbsolutePath()));
+            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("\"%s\" version", sibBinary.getAbsolutePath()));
             sibPrintVersion = (ver.size() == 0 ? "null" : ver.get(0));
             if (ver.size() == 0 || !BytesTool.versionCheck(sibVersion, ver.get(0))) {
                 printFail(type);
@@ -217,7 +217,7 @@ private boolean checkSGM() {
             sgmBinary.setExecutable(true);
             sgmBinary.setWritable(true);
             sgmBinary.setReadable(true);
-            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("%s -version", sgmBinary.getAbsolutePath()));
+            List<String> ver = ProcessCommandTool.getProcessLocalCommand(String.format("\"%s\" -version", sgmBinary.getAbsolutePath()));
             sgmPrintVersion = (ver.size() == 0 ? "null" : ver.get(0));
             if (ver.size() == 0 || !BytesTool.versionCheck(sgmVersion, ver.get(0).replace("sonic-go-mitmproxy:", "").trim())) {
                 printFail(type);