Improved folder sanitization

WildernessLabs · Apr 30, 2024 · 24424b0 · 24424b0
1 parent 88282fb
commit 24424b0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Source/v2/Meadow.CLI/Commands/Current/App/AppTools.cs b/Source/v2/Meadow.CLI/Commands/Current/App/AppTools.cs
@@ -118,11 +118,14 @@ internal static string SanitizeMeadowFilename(string fileName)
         {
             if (!folder.StartsWith(Path.DirectorySeparatorChar))
             {
-                folder = $"{Path.DirectorySeparatorChar}{folder}";
-            }
-            if (!folder.Contains(MeadowRootFolder))
-            {
-                folder = $"{Path.DirectorySeparatorChar}{MeadowRootFolder}{folder}";
+                if (!folder.StartsWith($"{MeadowRootFolder}"))
+                {
+                    folder = $"{Path.DirectorySeparatorChar}{MeadowRootFolder}{Path.DirectorySeparatorChar}{folder}";
+                }
+                else
+                {
+                    folder = $"{Path.DirectorySeparatorChar}{folder}";
+                }
             }
         }