diff --git a/DTLib.Network/FSP.cs b/DTLib.Network/FSP.cs index d9703d3..bff6aaf 100644 --- a/DTLib.Network/FSP.cs +++ b/DTLib.Network/FSP.cs @@ -137,10 +137,10 @@ public class FSP public void DownloadByManifest(string dirOnServer, string dirOnClient, bool overwrite = false, bool delete_excess = false) { - if (!dirOnClient.EndsWith("\\")) - dirOnClient += "\\"; - if (!dirOnServer.EndsWith("\\")) - dirOnServer += "\\"; + if (!dirOnClient.EndsWith(Путь.Разд)) + dirOnClient += Путь.Разд; + if (!dirOnServer.EndsWith(Путь.Разд)) + dirOnServer += Путь.Разд; Debug("b", "downloading manifest <", "c", dirOnServer + "manifest.dtsod", "b", ">"); var manifest = new DtsodV23(DownloadFileToMemory(dirOnServer + "manifest.dtsod").BytesToString()); Debug("g", $"found {manifest.Values.Count} files in manifest"); @@ -177,8 +177,8 @@ public class FSP public static void CreateManifest(string dir) { - if (!dir.EndsWith("\\")) - dir += "\\"; + if (!dir.EndsWith(Путь.Разд)) + dir += Путь.Разд; Log($"b", $"creating manifest of {dir}"); StringBuilder manifestBuilder = new(); Hasher hasher = new(); diff --git a/DTLib/Logging/FileLogger.cs b/DTLib/Logging/FileLogger.cs index 0cc3905..26cfe0d 100644 --- a/DTLib/Logging/FileLogger.cs +++ b/DTLib/Logging/FileLogger.cs @@ -11,7 +11,7 @@ public class FileLogger : IDisposable } public FileLogger(string dir, string programName) - : this($"{dir}\\{programName}_{DateTime.Now}.log".Replace(':', '-').Replace(' ', '_')) { } + : this($"{dir}{Путь.Разд}{programName}_{DateTime.Now}.log".Replace(':', '-').Replace(' ', '_')) { } public string LogfileName { get; protected set; } public System.IO.FileStream LogfileStream { get; protected set; } diff --git a/test.sh b/test.sh deleted file mode 100644 index d4b456f..0000000 --- a/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -printf " -first line -second line -"