fix findTorExecutableLocal()

Samourai-Wallet · Jan 1, 2020 · 7a52230 · 7a52230
1 parent a1bc326
commit 7a52230
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/com/samourai/tor/client/JavaTorClient.java b/src/main/java/com/samourai/tor/client/JavaTorClient.java
@@ -48,10 +48,10 @@ private TorConfig computeTorConfig(String dirName, Optional<File> torExecutable)
   private Optional<File> findTorExecutableLocal() {
     try {
       // try uppercase
-      List<String> whichResult = CliUtils.exec("which Tor");
+      List<String> whichResult = CliUtils.execOrEmpty("which Tor");
       if (whichResult.isEmpty()) {
         // try lowercase
-        whichResult = CliUtils.exec("which tor");
+        whichResult = CliUtils.execOrEmpty("which tor");
       }
       if (whichResult.size() > 0) {
         if (log.isDebugEnabled()) {

diff --git a/src/main/java/com/samourai/whirlpool/cli/utils/CliUtils.java b/src/main/java/com/samourai/whirlpool/cli/utils/CliUtils.java
@@ -180,6 +180,21 @@ protected static HttpClient computeHttpClient(Optional<CliProxy> cliProxyOptiona
     return jettyHttpClient;
   }
 
+  public static List<String> execOrEmpty(String cmd) throws Exception {
+    try {
+      return exec(cmd);
+    } catch (Exception e) {
+      if (log.isDebugEnabled()) {
+        log.debug(
+            "execOrNull error: "
+                + e.getClass().getName()
+                + ": "
+                + (e.getMessage() != null ? e.getMessage() : ""));
+      }
+    }
+    return new ArrayList<>();
+  }
+
   public static List<String> exec(String cmd) throws Exception {
     List<String> lines = new ArrayList<>();
     Process proc = null;