Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2299 from chlupac/InstallManFix

Browse Source 
Fix - InstallationManager crash when package folders are missing
This commit is contained in:
Shaun Walker 2022-07-19 13:12:43 -04:00 committed by GitHub
commit ded6c9c199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -48,26 +48,35 @@ namespace Oqtane.Infrastructure
} }
// move packages to secure /Packages folder // move packages to secure /Packages folder
foreach (var folder in "Modules,Themes,Packages".Split(",")) foreach (var folderName in "Modules,Themes,Packages".Split(","))
{ {
foreach(var file in Directory.GetFiles(Path.Combine(webRootPath, folder), "*.nupkg*")) string folder = Path.Combine(webRootPath, folderName);
if (Directory.Exists(folder))
{ {
var destinationFile = Path.Combine(sourceFolder, Path.GetFileName(file)); foreach (var file in Directory.GetFiles(folder, "*.nupkg*"))
if (File.Exists(destinationFile))
{ {
File.Delete(destinationFile); var destinationFile = Path.Combine(sourceFolder, Path.GetFileName(file));
} if (File.Exists(destinationFile))
if (destinationFile.ToLower().EndsWith(".nupkg.bak")) {
{ File.Delete(destinationFile);
// leave a copy in the current folder as it is distributed with the core framework }
File.Copy(file, destinationFile);
} if (destinationFile.ToLower().EndsWith(".nupkg.bak"))
else {
{ // leave a copy in the current folder as it is distributed with the core framework
// move to destination File.Copy(file, destinationFile);
File.Move(file, destinationFile); }
else
{
// move to destination
File.Move(file, destinationFile);
}
} }
} }
else
{
Directory.CreateDirectory(folder);
}
} }
// iterate through Nuget packages in source folder // iterate through Nuget packages in source folder
@ -200,7 +209,7 @@ namespace Oqtane.Infrastructure
string[] packages = Directory.GetFiles(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder), PackageName + "*.log"); string[] packages = Directory.GetFiles(Path.Combine(_environment.ContentRootPath, Constants.PackagesFolder), PackageName + "*.log");
if (packages.Length > 0) if (packages.Length > 0)
{ {
packagename = packages[packages.Length - 1]; // use highest version packagename = packages[packages.Length - 1]; // use highest version
} }
if (!string.IsNullOrEmpty(packagename)) if (!string.IsNullOrEmpty(packagename))
@ -245,7 +254,7 @@ namespace Oqtane.Infrastructure
string[] packages = Directory.GetFiles(folder, Constants.PackageId + ".*.nupkg"); string[] packages = Directory.GetFiles(folder, Constants.PackageId + ".*.nupkg");
if (packages.Length > 0) if (packages.Length > 0)
{ {
packagename = packages[packages.Length - 1]; // use highest version packagename = packages[packages.Length - 1]; // use highest version
} }
if (packagename != "") if (packagename != "")