warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes directory copying (#1668)

Browse source
This commit is contained in:
Kamron Batman 2024-02-09 23:25:20 -08:00 • committed by GitHub
parent 00332e542d
commit 3244704ea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 58 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Compression/TarArchive.cs
View file

@ -63,7 +63,7 @@ namespace Server.Compression
ZipFile.ExtractToDirectory(libarchiveFile, tempDir);
var libArchivePath = Path.Combine(tempDir, "libarchive");
PathUtility.MoveDirectory(Path.Combine(libArchivePath, "bin"), Path.Combine(Core.BaseDirectory, "bsdtar"));
PathUtility.MoveDirectoryContents(Path.Combine(libArchivePath, "bin"), Path.Combine(Core.BaseDirectory, "bsdtar"));
File.Delete(libarchiveFile);
return Path.Combine(Core.BaseDirectory, "bsdtar/bsdtar.exe");

4
Projects/UOContent/World Saves/AutoArchive.cs
View file

@ -97,7 +97,7 @@ namespace Server.Saves
Directory.CreateDirectory(AutomaticBackupPath);
var backupPath = Path.Combine(AutomaticBackupPath, Utility.GetTimeStamp());
PathUtility.MoveDirectory(args.OldSavePath, backupPath);
PathUtility.MoveDirectoryContents(args.OldSavePath, backupPath);
logger.Information("Created backup at {Path}", backupPath);
@ -150,7 +150,7 @@ namespace Server.Saves
Directory.Delete(savePath, true);
var dirInfo = new DirectoryInfo(folder);
logger.Information("Restoring backup {Directory}", dirInfo.Name);
PathUtility.MoveDirectory(folder, savePath);
PathUtility.MoveDirectoryContents(folder, savePath);
break;
}