Added support for batch scripts.

bitbound · Nov 20, 2016 · 7772920 · 7772920
1 parent 8b9b679
commit 7772920
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 11 deletions.
diff --git a/Make-EXE/Assets/MakeReg.reg b/Make-EXE/Assets/MakeReg.reg
diff --git a/Make-EXE/Assets/gear_32xLG.png b/Make-EXE/Assets/gear_32xLG.png
diff --git a/Make-EXE/MainWindow.xaml b/Make-EXE/MainWindow.xaml
@@ -6,8 +6,9 @@
         xmlns:local="clr-namespace:Make_EXE"
         mc:Ignorable="d"
         Title="Make EXE" Height="250" Width="300" Loaded="Window_Loaded" Icon="BuildSolution.ico">
-    <Grid Background="Black">
-        <TextBlock Foreground="White" Margin="10,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="25">Make EXE</TextBlock>
+    <Grid Background="Black" >
+    <Image Source="Assets/gear_32xLG.png" Opacity="0.15" Margin="20"></Image>
+        <TextBlock Foreground="White" Margin="10,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="25" FontFamily="Source Code Pro" FontWeight="Bold">Make EXE</TextBlock>
         <Button Name="buttonInfo" Background="Transparent"  VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,10,10,0" Cursor="Hand" ToolTip="Info" Click="buttonInfo_Click" BorderBrush="{x:Null}">
             <Image Source="Assets/StatusHelp_grey_32xLG.png" Height="20" Width="20"></Image>
         </Button>

diff --git a/Make-EXE/MainWindow.xaml.cs b/Make-EXE/MainWindow.xaml.cs
@@ -140,13 +140,13 @@ private void buttonInstall_Click(Object sender, RoutedEventArgs e)
             File.Copy(Application.ResourceAssembly.ManifestModule.Assembly.Location, installedPath, true);
             buttonInstall.IsEnabled = false;
             buttonRemove.IsEnabled = true;
-            MessageBox.Show("Install completed!  Now right-click some PowerShell files!  If the 'Make EXE' option isn't showing up, reset your program defaults and reinstall Make-EXE.", "Install Completed", MessageBoxButton.OK, MessageBoxImage.Information);
+            MessageBox.Show("Install completed!  If the 'Make EXE' option isn't showing up, reset your program defaults and reinstall Make-EXE.", "Install Completed", MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
         private void buttonRemove_Click(Object sender, RoutedEventArgs e)
         {
             Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Make-EXE", true);
-            var psi = new ProcessStartInfo("cmd.exe", @"/c reg.exe delete HKCR\.ps1\shell\MakeEXE /f&reg.exe delete HKCR\Microsoft.PowerShellScript.1\Shell\MakeEXE /f&reg.exe delete HKCR\Applications\powershell_ise.exe\shell\MakeEXE /f");
+            var psi = new ProcessStartInfo("cmd.exe", @"/c reg.exe delete HKCR\.ps1\shell\MakeEXE /f&reg.exe delete HKCR\Microsoft.PowerShellScript.1\Shell\MakeEXE /f&reg.exe delete HKCR\Applications\powershell_ise.exe\shell\MakeEXE /f&reg.exe delete HKCR\batfile\shell\MakeEXE /f");
             psi.WindowStyle = ProcessWindowStyle.Hidden;
             psi.Verb = "runas";
             var proc = Process.Start(psi);

diff --git a/Make-EXE/Make-EXE.csproj b/Make-EXE/Make-EXE.csproj
@@ -122,6 +122,9 @@
   <ItemGroup>
     <Resource Include="Assets\StatusHelp_grey_32xLG.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\gear_32xLG.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/Make-EXE/Maker.cs b/Make-EXE/Maker.cs
@@ -9,7 +9,7 @@ static void Main(string[] args)
             var assembly = System.Reflection.Assembly.GetExecutingAssembly();
             var resources = assembly.GetManifestResourceNames();
             Console.Title = resources[0];
-            Console.WriteLine("Extracting resources...");
+            Console.WriteLine("Extracting resource files...");
             var workingDir = "";
             var count = 0;
             while (workingDir == "")
@@ -20,16 +20,21 @@ static void Main(string[] args)
                     {
                         Directory.Delete(System.IO.Path.GetTempPath() + "Make-EXE" + count, true);
                     }
-                    workingDir = System.IO.Path.GetTempPath() + "Make-EXE" + count + @"\";
-                    Directory.CreateDirectory(workingDir);
+                    else
+                    {
+                        workingDir = System.IO.Path.GetTempPath() + "Make-EXE" + count + @"\";
+                        Directory.CreateDirectory(workingDir);
+                    }
                 }
                 catch
                 {
                     count++;
                 }
             }
+            count = 0;
             foreach (var resource in resources)
             {
+                Console.WriteLine("Extracting file " + count + " of " + resources.Length + "...");
                 using (var rs = assembly.GetManifestResourceStream(resource))
                 {
                     using (var fs = new FileStream(workingDir + resource, FileMode.Create))
@@ -41,7 +46,14 @@ static void Main(string[] args)
                 }
             }
             Console.WriteLine("Starting up...");
-            System.Diagnostics.Process.Start("powershell.exe", "-executionpolicy bypass -file \"" + workingDir + resources[0] + "\"");
+            if (Path.GetExtension(resources[0]).ToLower() == ".ps1")
+            {
+                System.Diagnostics.Process.Start("powershell.exe", "-executionpolicy bypass -file \"" + workingDir + resources[0] + "\"");
+            }
+            else if (Path.GetExtension(resources[0]).ToLower() == ".bat")
+            {
+                System.Diagnostics.Process.Start("cmd.exe", "/c " + resources[0]);
+            }
         }
     }
 }
diff --git a/Make-EXE/Properties/AssemblyInfo.cs b/Make-EXE/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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.9.3.0")]
-[assembly: AssemblyFileVersion("0.9.3.0")]
+[assembly: AssemblyVersion("0.9.4.0")]
+[assembly: AssemblyFileVersion("0.9.4.0")]
 [assembly: Guid("eea5aba0-927d-44ef-95ff-b4eccca23cfe")]
 
diff --git a/Make-EXE/Windows/AboutWindow.xaml b/Make-EXE/Windows/AboutWindow.xaml
@@ -20,7 +20,7 @@
         <Border Margin="0,67,0,35" BorderBrush="DimGray" BorderThickness="1">
             <ScrollViewer>
                 <TextBlock TextWrapping="Wrap">
-                    <Run Text="This app helps you easily create an EXE from a PowerShell script file.  It adds 'Make EXE' as an option when right-clicking a PowerShell file in Windows Explorer."></Run>
+                    <Run Text="This app helps you easily create an EXE from a PowerShell or batch script file.  It adds 'Make EXE' as an option when right-clicking a PS/BAT script file in Windows Explorer."></Run>
                     <LineBreak></LineBreak>
                     <LineBreak></LineBreak>
                     <Run Text="Third-party libraries used: Fody/Costura"></Run>