lanpartytools
/
LANCommander
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 17 Activity

Use new PowerShell in redistributable installs

pull/33/head
Pat Hartl 2023-11-15 23:53:26 -06:00
parent bf2c9ea45a
commit cb9f31a00a
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LANCommander.SDK/RedistributableManager.cs
View File

@ -2,6 +2,7 @@
using LANCommander.SDK.Extensions; using LANCommander.SDK.Extensions;
using LANCommander.SDK.Helpers; using LANCommander.SDK.Helpers;
using LANCommander.SDK.Models; using LANCommander.SDK.Models;
using LANCommander.SDK.PowerShell;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using SharpCompress.Common; using SharpCompress.Common;
using SharpCompress.Readers; using SharpCompress.Readers;
@ -57,7 +58,7 @@ namespace LANCommander.SDK
var detectionScript = redistributable.Scripts.FirstOrDefault(s => s.Type == ScriptType.DetectInstall); var detectionScript = redistributable.Scripts.FirstOrDefault(s => s.Type == ScriptType.DetectInstall);
detectionScriptTempFile = ScriptHelper.SaveTempScript(detectionScript); detectionScriptTempFile = ScriptHelper.SaveTempScript(detectionScript);
var detectionResult = PowerShellRuntime.RunScript(detectionScriptTempFile, detectionScript.RequiresAdmin); var detectionResult = RunScript(detectionScriptTempFile, redistributable);
// Redistributable is not installed // Redistributable is not installed
if (detectionResult == 0) if (detectionResult == 0)
@ -70,12 +71,12 @@ namespace LANCommander.SDK
{ {
extractTempPath = extractionResult.Directory; extractTempPath = extractionResult.Directory;
PowerShellRuntime.RunScript(installScriptTempFile, installScript.RequiresAdmin, null, extractTempPath); RunScript(installScriptTempFile, redistributable, installScript.RequiresAdmin, extractTempPath);
} }
} }
else else
{ {
PowerShellRuntime.RunScript(installScriptTempFile, installScript.RequiresAdmin, null, extractTempPath); RunScript(installScriptTempFile, redistributable, installScript.RequiresAdmin, extractTempPath);
} }
} }
} }
@ -164,5 +165,20 @@ namespace LANCommander.SDK
return extractionResult; return extractionResult;
} }
private int RunScript(string path, Redistributable redistributable, bool requiresAdmin = false, string workingDirectory = "")
{
var script = new PowerShellScript();
script.AddVariable("Redistributable", redistributable);
script.UseWorkingDirectory(workingDirectory);
script.UseFile(path);
if (requiresAdmin)
script.RunAsAdmin();
return script.Execute();
}
} }
} }