SpritePacker/Help.txt

@@ -1,5 +1,5 @@
 SpritePacker v{version}, by Starbeamrainbowlabs
-Built at {build-date} from git commit {commit-hash}
+Built at {build-time} from git commit {commit-hash}
 
 Usage:
     mono ./SpritePacker.exe [flags] [filenames]

SpritePacker/Program.cs

@@ -6,65 +6,38 @@ using System.Reflection;
 
 namespace SpritePacker
 {
-	enum ProgramMode
-	{
-		Normal,
-		DisplayHelpText,
-		DisplayVersionText
-	};
-
 	class Program
 	{
-		private static ProgramMode programMode = ProgramMode.Normal;
-		private static string helpTextFilename = "SpritePacker.Resources.HelpText.txt";
-		private static string versionTextFilename = "SpritePacker.Resources.VersionText.txt";
-		private static List<string> values = new List<string>();
-
 		public static void Main(string[] args)
 		{
+			Utilities.GetProgramBuildDate();
+			List<string> values = new List<string>();
 			for(int i = 0; i < args.Length; i++)
 			{
 				switch(args[i])
 				{
 					case "--help":
-						programMode = ProgramMode.DisplayHelpText;
-						break;
+						string helpText = Utilities.GetEmbeddedResourceContent("SpritePacker.Help.txt");
+						string commitHash = Utilities.GetEmbeddedResourceContent("SpritePacker.latest-commit-hash.txt").Trim();
+						Dictionary<string, string> templateValues = new Dictionary<string, string>() {
+							{ "version", Utilities.GetProgramVersion().ToString() },
+							{ "build-time", Utilities.GetProgramBuildDate().ToString("dd/MM/yyyy h:mmtt") },
+							{ "commit-hash", commitHash.Substring(commitHash.Length - 7) }
+						};
+						foreach (KeyValuePair<string, string> replacePair in templateValues)
+							helpText = helpText.Replace(string.Format("{{{0}}}", replacePair.Key), replacePair.Value);
+						
+						Console.WriteLine(helpText);
+						return;
 					case "--version":
-						programMode = ProgramMode.DisplayVersionText;
-						break;
+						Console.WriteLine("Version text coming soon!");
+						return;
 					default:
 						values.Add(args[i]);
 						break;
 				}
 			}
 
-			switch(programMode)
-			{
-				case ProgramMode.Normal:
-					RunNormal();
-					break;
-				case ProgramMode.DisplayHelpText:
-				case ProgramMode.DisplayVersionText:
-					string textFileName = programMode == ProgramMode.DisplayHelpText ? helpTextFilename : versionTextFilename;
-					string helpText = Utilities.GetEmbeddedResourceContent(textFileName);
-					string commitHash = Utilities.GetEmbeddedResourceContent("SpritePacker.latest-commit-hash.txt").Trim();
-					Dictionary<string, string> templateValues = new Dictionary<string, string>() {
-						{ "version", Utilities.GetProgramVersion().ToString() },
-						{ "build-date", Utilities.GetProgramBuildDate().ToString("dd/MM/yyyy h:mmtt") },
-						{ "commit-hash", commitHash.Substring(commitHash.Length - 7) },
-						{ "commit-url", string.Format("https://git.starbeamrainbowlabs.com/sbrl/SpritePacker/commit/{0}", commitHash) }
-					};
-					foreach (KeyValuePair<string, string> replacePair in templateValues)
-						helpText = helpText.Replace(string.Format("{{{0}}}", replacePair.Key), replacePair.Value);
-
-					Console.WriteLine(helpText);
-					break;
-			}
-
-		}
-
-		public static void RunNormal()
-		{
 			Packer spritePacker = new Packer();
 			foreach(string filename in values)
 			{

SpritePacker/Resources/VersionText.txt

@@ -1,5 +0,0 @@
-SpritePacker v{version}, by Starbeamrainbowlabs
-
-Built at {build-date}
-Built from git commit hash {commit-hash}
-Commit url: {commit-url}

SpritePacker/SpritePacker.csproj

@@ -45,11 +45,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <EmbeddedResource Include="Help.txt" />
     <EmbeddedResource Include="latest-commit-hash.txt" />
-    <EmbeddedResource Include="Resources\VersionText.txt" />
-    <EmbeddedResource Include="Resources\HelpText.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
   </ItemGroup>
 </Project>