Replace all 'StartsWith(rootdir)' with IsFileInDirectory

clowd · Jan 1, 2022 · b1ec154 · b1ec154
1 parent b564861
commit b1ec154
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/Squirrel/UpdateManager.ApplyReleases.cs b/src/Squirrel/UpdateManager.ApplyReleases.cs
@@ -538,7 +538,7 @@ internal void unshimOurselves()
                         if (regKey == null) return;
 
                         var toDelete = regKey.GetValueNames()
-                            .Where(x => x.StartsWith(rootAppDirectory, StringComparison.OrdinalIgnoreCase))
+                            .Where(x => Utility.IsFileInDirectory(x, rootAppDirectory))
                             .ToList();
 
                         toDelete.ForEach(x =>

diff --git a/src/Squirrel/UpdateManager.InstallHelpers.cs b/src/Squirrel/UpdateManager.InstallHelpers.cs
@@ -117,7 +117,7 @@ public void KillAllProcessesBelongingToPackage()
                         if (String.IsNullOrWhiteSpace(x.Item1)) return false;
 
                         // Files that aren't in our root app directory are untouched
-                        if (!x.Item1.StartsWith(rootAppDirectory, StringComparison.OrdinalIgnoreCase)) return false;
+                        if (!Utility.IsFileInDirectory(x.ProcessExePath, rootAppDirectory)) return false;
 
                         // Never kill our own EXE
                         if (ourExePath != null && x.Item1.Equals(ourExePath, StringComparison.OrdinalIgnoreCase)) return false;

diff --git a/src/Squirrel/UpdateManager.cs b/src/Squirrel/UpdateManager.cs
@@ -148,9 +148,8 @@ public SemanticVersion CurrentlyInstalledVersion(string executable = null)
         {
             executable = executable ?? AssemblyRuntimeInfo.EntryExePath;
 
-            if (!executable.StartsWith(rootAppDirectory, StringComparison.OrdinalIgnoreCase)) {
+            if (!Utility.IsFileInDirectory(executable, RootAppDirectory))
                 return null;
-            }
 
             var appDirName = executable.Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
                 .FirstOrDefault(x => x.StartsWith("app-", StringComparison.OrdinalIgnoreCase));
@@ -180,17 +179,11 @@ public void KillAllExecutablesBelongingToPackage()
             installHelpers.KillAllProcessesBelongingToPackage();
         }
 
-        public string ApplicationName {
-            get { return applicationName; }
-        }
+        public string ApplicationName => applicationName;
 
-        public string RootAppDirectory {
-            get { return rootAppDirectory; }
-        }
+        public string RootAppDirectory => rootAppDirectory;
 
-        public bool IsInstalledApp {
-            get { return Process.GetCurrentProcess().MainModule.FileName.StartsWith(RootAppDirectory, StringComparison.OrdinalIgnoreCase); }
-        }
+        public bool IsInstalledApp => Utility.IsFileInDirectory(AssemblyRuntimeInfo.EntryExePath, RootAppDirectory);
 
         /// <inheritdoc/>
         public void Dispose()