Merge pull request #222 scalar: Remove Scalar.Mount

scalar: Remove Scalar.Mount
microsoft · Nov 7, 2019 · cd8b527 · cd8b527
2 parents e2a8872 + 7d9fb90
commit cd8b527
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 575 deletions.
diff --git a/Scalar.Common/InstallerPreRunChecker.cs b/Scalar.Common/InstallerPreRunChecker.cs
@@ -74,11 +74,8 @@ public virtual bool IsInstallationBlockedByRunningProcess(out string consoleErro
         {
             consoleError = null;
 
-            // While checking for blocking processes like Scalar.Mount immediately after un-mounting,
-            // then sometimes Scalar.Mount shows up as running. But if the check is done after waiting
-            // for some time, then eventually Scalar.Mount goes away. The retry loop below is to help
-            // account for this delay between the time un-mount call returns and when Scalar.Mount
-            // actually quits.
+            // The retry loop below is to help account for the delay between calls to stop Scalar
+            // processes and those processes exiting.
             this.tracer.RelatedInfo("Checking if Scalar or dependent processes are running.");
             int retryCount = 10;
             HashSet<string> processList = null;

diff --git a/Scalar.Common/Platforms/POSIX/POSIXPlatform.cs b/Scalar.Common/Platforms/POSIX/POSIXPlatform.cs
@@ -259,7 +259,7 @@ public override string ProgramLocaterCommand
 
             public override HashSet<string> UpgradeBlockingProcesses
             {
-                get { return new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Scalar.Mount", "git", "wish" }; }
+                get { return new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "git", "wish" }; }
             }
 
             public override bool SupportsUpgradeWhileRunning => true;

diff --git a/Scalar.Common/Platforms/Windows/WindowsPlatform.cs b/Scalar.Common/Platforms/Windows/WindowsPlatform.cs
@@ -441,7 +441,7 @@ public override string ProgramLocaterCommand
 
             public override HashSet<string> UpgradeBlockingProcesses
             {
-                get { return new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Scalar", "Scalar.Mount", "git", "ssh-agent", "wish", "bash" }; }
+                get { return new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Scalar", "git", "ssh-agent", "wish", "bash" }; }
             }
 
             // Tests show that 250 is the max supported pipe name length

diff --git a/Scalar.Common/ScalarPlatform.cs b/Scalar.Common/ScalarPlatform.cs
@@ -164,11 +164,6 @@ public abstract class ScalarPlatformConstants
             /// </summary>
             public abstract HashSet<string> UpgradeBlockingProcesses { get; }
 
-            public string MountExecutableName
-            {
-                get { return "Scalar.Mount" + this.ExecutableExtension; }
-            }
-
             public string ScalarUpgraderExecutableName
             {
                 get { return "Scalar.Upgrader" + this.ExecutableExtension; }

diff --git a/Scalar.Installer.Mac/Scalar.Installer.Mac.csproj b/Scalar.Installer.Mac/Scalar.Installer.Mac.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Scalar\Scalar.csproj" />
-    <ProjectReference Include="..\Scalar.Mount\Scalar.Mount.csproj" />
     <ProjectReference Include="..\Scalar.Service\Scalar.Service.csproj" />
     <ProjectReference Include="..\Scalar.Upgrader\Scalar.Upgrader.csproj" />
     <ProjectReference Include="..\Scalar.Notifications.Mac\Scalar.Notifications.Mac.csproj" />

diff --git a/Scalar.Installer.Mac/layout.sh b/Scalar.Installer.Mac/layout.sh
@@ -61,9 +61,6 @@ function CopyScalar()
     copyCmd="cp -Rf \"${OUT_DIR}/Scalar/${PUBPATH_FRAGMENT}\" \"${SCALAR_DESTINATION}\"" || exit 1
     eval $copyCmd || exit 1
 
-    copyCmd="cp -Rf \"${OUT_DIR}/Scalar.Mount/${PUBPATH_FRAGMENT}\" \"${SCALAR_DESTINATION}\"" || exit 1
-    eval $copyCmd || exit 1
-
     copyCmd="cp -Rf \"${OUT_DIR}/Scalar.Service/${PUBPATH_FRAGMENT}\" \"${SCALAR_DESTINATION}\"" || exit 1
     eval $copyCmd || exit 1
 

diff --git a/Scalar.Installer.Windows/Scalar.Installer.Windows.csproj b/Scalar.Installer.Windows/Scalar.Installer.Windows.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Scalar\Scalar.csproj" />
-    <ProjectReference Include="..\Scalar.Mount\Scalar.Mount.csproj" />
     <ProjectReference Include="..\Scalar.Service\Scalar.Service.csproj" />
     <ProjectReference Include="..\Scalar.Service.UI\Scalar.Service.UI.csproj" />
     <ProjectReference Include="..\Scalar.Upgrader\Scalar.Upgrader.csproj" />

diff --git a/Scalar.Installer.Windows/Setup.iss b/Scalar.Installer.Windows/Setup.iss
@@ -241,7 +241,7 @@ function IsScalarRunning(): Boolean;
 var
   ResultCode: integer;
 begin
-  if Exec('powershell.exe', '-NoProfile "Get-Process scalar,scalar.mount | foreach {exit 10}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+  if Exec('powershell.exe', '-NoProfile "Get-Process scalar | foreach {exit 10}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
     begin
       if ResultCode = 10 then
         begin

diff --git a/Scalar.Mount/InProcessMount.cs b/Scalar.Mount/InProcessMount.cs