diff --git a/README.md b/README.md index 44b4de9..2e7aa0b 100644 --- a/README.md +++ b/README.md @@ -528,14 +528,14 @@ all of them — no extra route is needed. The one binary supports: ```text -Agent.exe foreground run interactively (console logging) -Agent.exe install create/update the Windows service (idempotent) -Agent.exe start start the service -Agent.exe stop stop the service -Agent.exe initialize install + start -Agent.exe remove stop + remove the service -Agent.exe status machine- and human-readable state -Agent.exe version unified build version +ExecuteR-Agent.exe foreground run interactively (console logging) +ExecuteR-Agent.exe install create/update the Windows service (idempotent) +ExecuteR-Agent.exe start start the service +ExecuteR-Agent.exe stop stop the service +ExecuteR-Agent.exe initialize install + start +ExecuteR-Agent.exe remove stop + remove the service +ExecuteR-Agent.exe status machine- and human-readable state +ExecuteR-Agent.exe version unified build version ``` Launched by the SCM with no argument, it runs as a service (`LocalSystem`, diff --git a/scripts/Package-Agent.ps1 b/scripts/Package-Agent.ps1 index f27dc8e..e8a7ee4 100644 --- a/scripts/Package-Agent.ps1 +++ b/scripts/Package-Agent.ps1 @@ -56,9 +56,10 @@ foreach ($rid in $Runtimes) { # Shipping bundles carry no debug symbols. Get-ChildItem $ridPublishDir -Filter '*.pdb' -Recurse | Remove-Item -Force - # A recognizable binary name on unix; the MSI harvest expects Agent.exe. + # A lowercase binary name on unix; Windows keeps ExecuteR-Agent.exe, which + # the MSI harvest expects and which names the rolling log after itself. if ($rid -notlike 'win-*') { - Rename-Item (Join-Path $ridPublishDir 'Agent') 'executer-agent' + Rename-Item (Join-Path $ridPublishDir 'ExecuteR-Agent') 'executer-agent' } Copy-Item $modulesStage (Join-Path $ridPublishDir 'Modules') -Recurse diff --git a/src/Agent/Agent.csproj b/src/Agent/Agent.csproj index 8b6e8f6..652a72c 100644 --- a/src/Agent/Agent.csproj +++ b/src/Agent/Agent.csproj @@ -7,7 +7,7 @@ inventory, systemd/launchd, forkpty remote shell). --> net10.0-windows;net10.0 Agent - Agent + ExecuteR-Agent ExecuteR Agent ExecuteR Agent win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 diff --git a/src/Agent/Commands/AgentCli.cs b/src/Agent/Commands/AgentCli.cs index 2bbedc8..528a7c4 100644 --- a/src/Agent/Commands/AgentCli.cs +++ b/src/Agent/Commands/AgentCli.cs @@ -191,7 +191,7 @@ public static class AgentCli { Console.WriteLine($"{Branding.AgentServiceDisplayName} {BuildVersion.Resolve(typeof(AgentCli).Assembly)}"); Console.WriteLine(); - Console.WriteLine("Usage: Agent.exe "); + Console.WriteLine("Usage: ExecuteR-Agent.exe "); Console.WriteLine(); Console.WriteLine("Commands:"); Console.WriteLine(" foreground Run interactively with console logging"); diff --git a/src/Backend/Enrollment/InstallEndpoints.cs b/src/Backend/Enrollment/InstallEndpoints.cs index 69b494b..b90a93f 100644 --- a/src/Backend/Enrollment/InstallEndpoints.cs +++ b/src/Backend/Enrollment/InstallEndpoints.cs @@ -233,7 +233,7 @@ public static class InstallEndpoints $wc.Dispose() New-Item -ItemType Directory -Force -Path $dest | Out-Null Expand-Archive -Path $zip -DestinationPath $dest -Force - $exe = Join-Path $dest 'Agent.exe' + $exe = Join-Path $dest 'ExecuteR-Agent.exe' # Seed configuration then install + start the service via the agent's own APIs. New-Item -Path 'HKLM:\SOFTWARE\ExecuteR' -Force | Out-Null Set-ItemProperty -Path 'HKLM:\SOFTWARE\ExecuteR' -Name 'ServerURL' -Value $server diff --git a/src/Installer/Product.wxs b/src/Installer/Product.wxs index 64801bc..5242e05 100644 --- a/src/Installer/Product.wxs +++ b/src/Installer/Product.wxs @@ -90,7 +90,7 @@ - + Normal machine configuration key below HKLM. public const string AgentRegistryKey = @"SOFTWARE\" + ProductKey;