license

Rynchodon · Jan 22, 2017 · f1cac97 · f1cac97
1 parent e32675f
commit f1cac97
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 22 deletions.
diff --git a/Injector/CommandLine.cs b/Injector/CommandLine.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
-using System.Threading;
 
 namespace Rynchodon.Injector
 {
@@ -72,22 +71,12 @@ public bool Match(string arg)
 
 		static void Main(string[] args)
 		{
-			try
+			if (args == null || args.Length == 0)
 			{
-				if (args == null || args.Length == 0)
-				{
-					DllInjector.Run();
-					return;
-				}
-				Parse(args);
-				Thread.Sleep(2000);
-			}
-			catch (Exception ex)
-			{
-				Console.Error.WriteLine(ex);
-				Thread.Sleep(60000);
-				throw;
+				DllInjector.Run();
+				return;
 			}
+			Parse(args);
 		}
 
 		private static SortedDictionary<OptionName, Option> GetOptions()

diff --git a/Injector/Injector.csproj b/Injector/Injector.csproj
@@ -78,7 +78,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\global.config" />
   <PropertyGroup>
-    <PostBuildEvent>start cmd.exe /C ""$(ReferencePath)\LoadArms.exe" --author=Rynchodon --repo=Load-ARMS --allBuilds LoadARMS.exe LoadArms.dll "..\..\..\..\Load-ARMS Readme.txt""</PostBuildEvent>
+    <PostBuildEvent>start cmd.exe /C ""$(ReferencePath)\LoadArms.exe" --author=Rynchodon --repo=Load-ARMS --allBuilds LoadARMS.exe LoadArms.dll "..\..\..\..\Load-ARMS Readme.txt" "..\..\..\..\Load-ARMS License.txt""</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>

diff --git a/Injector/Properties/VersionInfo.cs b/Injector/Properties/VersionInfo.cs
@@ -12,4 +12,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.4")]
+[assembly: AssemblyVersion("0.5.1.0")]
diff --git a/LICENSE → Load-ARMS License.txt b/LICENSE → Load-ARMS License.txt
diff --git a/Loader/DownloadProgress.cs b/Loader/DownloadProgress.cs
@@ -6,7 +6,7 @@
 namespace Rynchodon.Loader
 {
 	/// <summary>
-	/// Creates a GUI screen to show download progress.
+	/// Creates a GUI screen to show download progress. This screen prevents the player from doing anything until it closes.
 	/// </summary>
 	class DownloadProgress : MyGuiScreenProgressAsync, IDisposable
 	{

diff --git a/Loader/LoadArms.cs b/Loader/LoadArms.cs
@@ -210,6 +210,10 @@ private void Robocopy()
 				return;
 			_startedRobocopy = true;
 
+			string license = PathExtensions.Combine(_directory, "mods\\Rynchodon.Load-ARMS\\Load-ARMS License.txt");
+			if (File.Exists(license))
+				File.Copy(license, PathExtensions.Combine(_directory, "License.txt"), true);
+
 			Logger.WriteLine("starting robocopy");
 
 			string first = '"' + _directory + "mods\\Rynchodon.Load-ARMS\" \"" + _directory + "..\\";
@@ -258,7 +262,6 @@ void IPlugin.Update()
 				foreach (IPlugin plugin in _plugins)
 					plugin.Init(MySandboxGame.Static);
 
-				_directory = null;
 				_config = default(Config);
 				_data = default(Data);
 				_task = default(ParallelTasks.Task);
@@ -519,7 +522,7 @@ private void Cleanup()
 		{
 			string myDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\";
 
-			foreach (string fileName in new string[] { "ARMS.dll", "ARMS - Release Notes.txt", "ExtendWhitelist.exe", "ExtendWhitelist.dll", "ExtendWhitelist.log", "LoadARMS.log" , "Load-ARMS Readme.txt" })
+			foreach (string fileName in new string[] { "ARMS.dll", "ARMS - Release Notes.txt", "ExtendWhitelist.exe", "ExtendWhitelist.dll", "ExtendWhitelist.log", "LoadARMS.log", "Load-ARMS Readme.txt", "Load-ARMS License.txt" })
 			{
 				string fullPath = myDirectory + fileName;
 				if (File.Exists(fullPath))

diff --git a/Loader/PathExtensions.cs b/Loader/PathExtensions.cs
@@ -14,6 +14,9 @@ static class PathExtensions
 		/// <returns>The combined paths.</returns>
 		public static string Combine(params string[] pathParts)
 		{
+			if (pathParts == null)
+				throw new ArgumentNullException("pathParts");
+
 			int index = 0;
 			string path = pathParts[index];
 			if (path == null)

diff --git a/Loader/ReleaseCreater.cs b/Loader/ReleaseCreater.cs
@@ -72,7 +72,7 @@ public static void Publish(ModVersion modVersion, string directory, string oAuth
 				compress.Wait();
 
 				if (input.ZipFileName == null)
-					input.ZipFileName = modVersion.fullName + ".zip";
+					input.ZipFileName = modVersion.repository + ".zip";
 				else if (!input.ZipFileName.EndsWith(".zip"))
 					input.ZipFileName = input.ZipFileName + ".zip";
 

diff --git a/Publish.bat b/Publish.bat
@@ -1,2 +1,2 @@
 cd Injector\bin\x64\Release
-"C:\Games\Steam\SteamApps\common\SpaceEngineers\Bin64\LoadArms.exe" --author=Rynchodon --repo=Load-ARMS --allBuilds --publish LoadARMS.exe LoadArms.dll "..\..\..\..\Load-ARMS Readme.txt"
+"C:\Games\Steam\SteamApps\common\SpaceEngineers\Bin64\LoadArms.exe" --author=Rynchodon --repo=Load-ARMS --allBuilds --publish LoadARMS.exe LoadArms.dll "..\..\..\..\Load-ARMS Readme.txt" "..\..\..\..\Load-ARMS License.txt"