Skip to content

Use plugin bat when installing on Windows #23

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

Merged
merged 1 commit into from
Oct 11, 2019
Merged

Use plugin bat when installing on Windows #23

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
4 changes: 2 additions & 2 deletions src/Elastic.Managed.Ephemeral/Tasks/IClusterComposeTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public abstract class ClusterComposeTask : IClusterComposeTask
{
public abstract void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluster);

protected static bool IsMono { get; } = Type.GetType("Mono.Runtime") != null;
protected static string BinarySuffix => IsMono || Path.DirectorySeparatorChar == '/' ? "" : ".bat";
protected static bool IsWindows { get; } = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
protected static string BinarySuffix => IsWindows ? ".bat" : string.Empty;

protected static void DownloadFile(string from, string to)
{
Expand Down
16 changes: 8 additions & 8 deletions src/Elastic.Managed.Ephemeral/Tasks/InstallationTasks/InstallPlugins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluste
cluster.Writer?.WriteDiagnostic($"{{{nameof(Run)}}} attempting install [{plugin.SubProductName}] as it's not OOTB: {{{plugin.ShippedByDefaultAsOf}}} and valid for {v}: {{{plugin.IsValid(v)}}}");
//var installParameter = v.ReleaseState == ReleaseState.Released ? plugin.Moniker : UseHttpPluginLocation(cluster.Writer, fs, plugin, v);
var installParameter = UseHttpPluginLocation(cluster.Writer, fs, plugin, v);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
ExecuteBinary(cluster.ClusterConfiguration, cluster.Writer, "cmd", $"install elasticsearch plugin: {plugin.SubProductName}", $"/c CALL {fs.PluginBinary} install --batch", installParameter);
else
{
if (!Directory.Exists(fs.ConfigPath)) Directory.CreateDirectory(fs.ConfigPath);
ExecuteBinary(cluster.ClusterConfiguration, cluster.Writer, fs.PluginBinary, $"install elasticsearch plugin: {plugin.SubProductName}", "install --batch", installParameter);
}
if (!Directory.Exists(fs.ConfigPath)) Directory.CreateDirectory(fs.ConfigPath);
ExecuteBinary(
cluster.ClusterConfiguration,
cluster.Writer,
fs.PluginBinary + BinarySuffix,
$"install elasticsearch plugin: {plugin.SubProductName}",
"install --batch", installParameter);

CopyConfigDirectoryToHomeCacheConfigDirectory(cluster, plugin);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Managed.Ephemeral/Tasks/InstallationTasks/XPack/PathXPackInBatFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluste
var v = config.Version;

if (v.Major != 5) return;
if (IsMono || Path.DirectorySeparatorChar == '/') return;
if (!IsWindows) return;

cluster.Writer?.WriteDiagnostic($"{{{nameof(PathXPackInBatFile)}}} patching x-pack .in.bat to accept CONF_DIR");
PatchPlugin(v, fileSystem);
Expand Down