fix and dedup code

test does not understand shell subcommand syntax
cryptomator · Aug 16, 2024 · 4b81bff · 4b81bff
1 parent 91f6839
commit 4b81bff
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/src/main/java/org/cryptomator/linux/quickaccess/DolphinPlaces.java b/src/main/java/org/cryptomator/linux/quickaccess/DolphinPlaces.java
@@ -6,6 +6,7 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
+import org.cryptomator.linux.util.SupportUtil;
 import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
@@ -160,14 +161,6 @@ private int indexOfEntryOpeningTag(String placesContent, int idIndex) {
 
  @CheckAvailability
  public static boolean isSupported() {
- try {
- var nautilusExistsProc = new ProcessBuilder().command("test", "`command -v dolphin`").start();
- if (nautilusExistsProc.waitFor(5000, TimeUnit.MILLISECONDS)) {
- return nautilusExistsProc.exitValue() == 0;
- }
- } catch (IOException | InterruptedException e) {
- //NO-OP
- }
- return false;
+ return SupportUtil.commandExists("dolphin");
  }
 }
diff --git a/src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java b/src/main/java/org/cryptomator/linux/quickaccess/NautilusBookmarks.java
@@ -6,6 +6,7 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
+import org.cryptomator.linux.util.SupportUtil;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -84,14 +85,6 @@ public void remove() throws QuickAccessServiceException {
 
  @CheckAvailability
  public static boolean isSupported() {
- try {
- var nautilusExistsProc = new ProcessBuilder().command("test", "`command -v nautilus`").start();
- if (nautilusExistsProc.waitFor(5000, TimeUnit.MILLISECONDS)) {
- return nautilusExistsProc.exitValue() == 0;
- }
- } catch (IOException | InterruptedException e) {
- //NO-OP
- }
- return false;
+ return SupportUtil.commandExists("nautilus");
  }
 }
diff --git a/src/main/java/org/cryptomator/linux/util/SupportUtil.java b/src/main/java/org/cryptomator/linux/util/SupportUtil.java
@@ -0,0 +1,21 @@
+package org.cryptomator.linux.util;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+public class SupportUtil {
+
+ public static boolean commandExists(String commandName) {
+ var shell = Objects.requireNonNullElse(System.getenv("SHELL"),"sh");
+ try {
+ var cmdExistsProcess = new ProcessBuilder().command(shell, "-c", "command -v " + commandName).start();
+ if (cmdExistsProcess.waitFor(5000, TimeUnit.MILLISECONDS)) {
+ return cmdExistsProcess.exitValue() == 0;
+ }
+ } catch (IOException | InterruptedException e) {
+ //NO-OP
+ }
+ return false;
+ }
+}