From 0a9d2cde7fb367fe41c479a7150b846be9c38391 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 5 Nov 2021 12:01:10 +0100
Subject: [PATCH] Fix - ln -s on Linux and Popen is weird

---
 start.py | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/start.py b/start.py
index 25afb49445..8953dc02f5 100644
--- a/start.py
+++ b/start.py
@@ -292,24 +292,27 @@ def run_disk_mapping_commands(mongo_url):
         return
 
     mappings = disk_mapping.get(low_platform) or []
-    if low_platform == "windows":
-        command = "subst"
-    else:
-        command = "ln -s"
     for source, destination in mappings:
-        args = [command, destination.rstrip('/'), source.rstrip('/')]
-        _print("disk mapping args:: {}".format(args))
-        try:
-            output = subprocess.Popen(args)
-            if output.returncode and output.returncode != 0:
-                exc_msg = "Executing args was not successful: \"{}\"".format(
-                    args)
-
-                raise RuntimeError(exc_msg)
-        except TypeError:
-            _print("Error in mapping drive")
-            raise
+        destination = destination.rstrip('/')
+        source = source.rstrip('/')
+        if low_platform == "windows":
+            args = ["subst", destination, source]
+            _print("disk mapping args:: {}".format(args))
+            try:
+                output = subprocess.Popen(args)
+                if output.returncode and output.returncode != 0:
+                    exc_msg = "Executing was not successful: \"{}\"".format(
+                        args)
 
+                    raise RuntimeError(exc_msg)
+            except TypeError:
+                _print("Error in mapping drive")
+                raise
+        else:
+            if not os.path.exists(destination):
+                os.symlink(source, destination)
+            else:
+                _print("Destination {} already exists".format(destination))
 
 def set_avalon_environments():
     """Set avalon specific environments.