Improve path strings combining in the installation tool

* Install file update. * Install script: removed copying of Framework.dll. Co-authored-by: mosowski <[email protected]>
ly774508966 · Jan 28, 2022 · bec7cf0 · bec7cf0
1 parent 1f29fa2
commit bec7cf0
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/Install/Install.cs b/Install/Install.cs
@@ -35,7 +35,7 @@ private static void Main(string[] arguments) {
 
 		projectPath = projectPath.Replace("\"", String.Empty, StringComparison.Ordinal).Replace("\'", String.Empty, StringComparison.Ordinal).TrimEnd(Path.DirectorySeparatorChar);
 
-		string sourcePath = Directory.GetCurrentDirectory() + "/..";
+		string sourcePath = Path.Combine(Directory.GetCurrentDirectory(), "..");
 
 		if (Directory.GetFiles(projectPath, "*.uproject", SearchOption.TopDirectoryOnly).Length != 0) {
 			Console.WriteLine($"Project file found in \"{ projectPath }\" folder!");
@@ -63,21 +63,21 @@ private static void Main(string[] arguments) {
 			}
 
 			if (overwriteFiles) {
-				string nativeSource = sourcePath + "/Source/Native";
+				string nativeSource = Path.Combine(sourcePath, "Source/Native");
 
 				Console.WriteLine(Environment.NewLine + "Removing the previous plugin installation...");
 
-				if (Directory.Exists(projectPath + "/Plugins/UnrealCLR"))
-					Directory.Delete(projectPath + "/Plugins/UnrealCLR", true);
+				if (Directory.Exists(Path.Combine(projectPath, "Plugins/UnrealCLR")))
+					Directory.Delete(Path.Combine(projectPath, "Plugins/UnrealCLR"), true);
 
 				Console.WriteLine("Copying native source code and the runtime host of the plugin...");
 
 				foreach (string directoriesPath in Directory.GetDirectories(nativeSource, "*", SearchOption.AllDirectories)) {
-					Directory.CreateDirectory(directoriesPath.Replace(nativeSource, projectPath + "/Plugins/UnrealCLR", StringComparison.Ordinal));
+					Directory.CreateDirectory(directoriesPath.Replace(nativeSource, Path.Combine(projectPath, "Plugins/UnrealCLR"), StringComparison.Ordinal));
 				}
 
 				foreach (string filesPath in Directory.GetFiles(nativeSource, "*.*", SearchOption.AllDirectories)) {
-					File.Copy(filesPath, filesPath.Replace(nativeSource, projectPath  + "/Plugins/UnrealCLR", StringComparison.Ordinal), true);
+					File.Copy(filesPath, filesPath.Replace(nativeSource, Path.Combine(projectPath, "Plugins/UnrealCLR"), StringComparison.Ordinal), true);
 				}
 
 				Console.WriteLine("Launching compilation of the managed runtime...");
@@ -105,25 +105,26 @@ private static void Main(string[] arguments) {
 
 				frameworkCompilation.WaitForExit();
 
+
 				if (frameworkCompilation.ExitCode != 0)
 					Error("Compilation of the framework was finished with an error (Exit code: " + frameworkCompilation.ExitCode + ")!");
 
 				if (compileTests) {
-					string contentPath = sourcePath + "/Content";
+					string contentPath = Path.Combine(sourcePath, "Content");
 
 					Console.WriteLine("Removing the previous content of the tests...");
 
-					if (Directory.Exists(projectPath + "/Content/Tests"))
-						Directory.Delete(projectPath + "/Content/Tests", true);
+					if (Directory.Exists(Path.Combine(projectPath, "Content/Tests")))
+						Directory.Delete(Path.Combine(projectPath, "Content/Tests"), true);
 
 					Console.WriteLine("Copying the content of the tests...");
 
 					foreach (string directoriesPath in Directory.GetDirectories(contentPath, "*", SearchOption.AllDirectories)) {
-						Directory.CreateDirectory(directoriesPath.Replace(contentPath, projectPath + "/Content", StringComparison.Ordinal));
+						Directory.CreateDirectory(directoriesPath.Replace(contentPath, Path.Combine(projectPath, "Content"), StringComparison.Ordinal));
 					}
 
 					foreach (string filesPath in Directory.GetFiles(contentPath, "*.*", SearchOption.AllDirectories)) {
-						File.Copy(filesPath, filesPath.Replace(contentPath, projectPath  + "/Content", StringComparison.Ordinal), true);
+						File.Copy(filesPath, filesPath.Replace(contentPath, Path.Combine(projectPath, "Content"), StringComparison.Ordinal), true);
 					}
 
 					Console.WriteLine("Launching compilation of the tests...");