Merge branch 'main' of https://github.com/departement-info-cem/script…

…s-mobile
departement-info-cem · Oct 16, 2024 · 0730f53 · 0730f53
2 parents 612be6d + 7a13906
commit 0730f53
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/scriptsharp/ScriptSharp/Utils.cs b/scriptsharp/ScriptSharp/Utils.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -373,13 +374,9 @@ public static void DeleteAll()
         DeleteThis( Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
             "AppData", "Local", "Android"));
         DeleteThis( Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-            "AppData", "Local", "Google", "AndroidStudio2024.2"));
+            "AppData", "Local", "Google", "AndroidStudio*"));
         DeleteThis( Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-            "AppData", "Roaming", "Google", "AndroidStudio2024.2"));
-        DeleteThis( Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-            "AppData", "Local", "Google", "AndroidStudio2024.1"));
-        DeleteThis( Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
-            "AppData", "Roaming", "Google", "AndroidStudio2024.1"));
+            "AppData", "Roaming", "Google", "AndroidStudio*"));
         DeleteThis(Environment.GetFolderPath(Environment.SpecialFolder.Desktop)); 
         DeleteThis(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".android"));
         DeleteThis(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".gradle"));
@@ -389,12 +386,24 @@ public static void DeleteAll()
 
     private static void DeleteThis(string path)
     {
-        try {
-            if (Directory.Exists(path))
-            { Directory.Delete(path, true); }
+        try
+        {
+            DirectoryInfo parent = Directory.GetParent(path)!;
+            string pattern = new DirectoryInfo(path).Name;
+            foreach (string dir in Directory.GetDirectories(parent.FullName, pattern))
+            {
+                Directory.Delete(dir);
+            }
+
+            foreach (string file in Directory.GetFiles(parent.FullName, pattern))
+            {
+                File.Delete(file);
+            }
         }
         catch (Exception ex)
-        { Console.WriteLine($"An error occurred while deleting the directory {path}: {ex.Message}  {ex.Data}"); }
+        {
+            Console.WriteLine($"An error occurred while deleting the directory {path}: {ex.Message}  {ex.Data}");
+        }
     }
 }