able to run docker on macOS

crossmob · Jun 18, 2020 · 3dd9558 · 3dd9558
1 parent 8db5c76
commit 3dd9558
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cmmanager b/cmmanager
diff --git a/cmutils/cmutils-tools/src/main/java/org/crossmobile/utils/SystemDependent.java b/cmutils/cmutils-tools/src/main/java/org/crossmobile/utils/SystemDependent.java
@@ -13,12 +13,11 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 
 import static org.crossmobile.utils.SystemDependent.Execs.BASH;
 import static org.crossmobile.utils.SystemDependent.Execs.JAVA;
+import static org.crossmobile.utils.TextUtils.iterableToString;
 
 public class SystemDependent {
 
@@ -305,6 +304,15 @@ public static String getFullName() {
         return "Company";
     }
 
+    public static Map<String, String> getEnvWithFixedPaths() {
+        Map<String, String> env = new HashMap<>(System.getenv());
+        Collection<String> paths = new LinkedHashSet<>(Arrays.asList(env.getOrDefault("PATH", "").split(File.pathSeparator)));
+        paths.add("/usr/local/bin");
+        paths.add("/usr/local/sbin");
+        env.put("PATH", iterableToString(paths, File.pathSeparator));
+        return env;
+    }
+
     public enum Execs {
 
         JAVA("exe"),