Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scalar: Remove Scalar.Mount #222

Merged
merged 1 commit into from
Nov 7, 2019
Merged

scalar: Remove Scalar.Mount #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Scalar.Common/InstallerPreRunChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Scalar.Common/Platforms/POSIX/POSIXPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Scalar.Common/Platforms/Windows/WindowsPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions Scalar.Common/ScalarPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
1 change: 0 additions & 1 deletion Scalar.Installer.Mac/Scalar.Installer.Mac.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 0 additions & 3 deletions Scalar.Installer.Mac/layout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion Scalar.Installer.Windows/Scalar.Installer.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion Scalar.Installer.Windows/Setup.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
264 changes: 0 additions & 264 deletions Scalar.Mount/InProcessMount.cs
View file
Open in desktop

This file was deleted.

Loading