1.7.6: Add support for relative paths in scripts

M1kerochip · Jun 13, 2020 · b403a76 · b403a76
1 parent eefb575
commit b403a76
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 29 deletions.
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.7.5.0")>
-<Assembly: AssemblyFileVersion("1.7.5.0")>
+<Assembly: AssemblyVersion("1.7.6.0")>
+<Assembly: AssemblyFileVersion("1.7.6.0")>
diff --git a/Scripts_RelativeDirectories/_Notes.txt b/Scripts_RelativeDirectories/_Notes.txt
@@ -1,4 +1,4 @@
-Each bactch file has the path to the .exe hard coded, to a relative directory.
+Each batch file has the path to the .exe hard coded, to a relative directory.
 
 To use, decompress the required files to a folder on your HDD, and place the script files in the same folder.
 

diff --git a/_Notes.txt b/_Notes.txt
diff --git a/bin/Release/RunGreaseWeazel.exe b/bin/Release/RunGreaseWeazel.exe
diff --git a/frmMain.vb b/frmMain.vb
@@ -433,6 +433,29 @@ Public Class frmMain
         Replace(cmbDiskRevision.Text, " ", "_")
     End Sub
 
+    Function ExecuteCommand(ByVal fileToRun As String, ByVal Arguments As String, ByVal WinState As Integer) As Boolean
+        Dim CMD As New Process
+        CMD.StartInfo.FileName = fileToRun
+        CMD.StartInfo.Arguments = Arguments
+        Select Case WinState
+            Case 0, 1   'Execute With normal cmd window (ie chkbox onscreen ticked or unticked)
+                CMD.StartInfo.UseShellExecute = True
+                CMD.StartInfo.WindowStyle = ProcessWindowStyle.Normal
+
+            Case 2      'Execute With hidden cmd window (ie chkbox onscreen is third state/half checked)
+                CMD.StartInfo.UseShellExecute = True
+                CMD.StartInfo.WindowStyle = ProcessWindowStyle.Minimized
+
+            Case 3      'Execute With no cmd window
+                CMD.StartInfo.UseShellExecute = False
+                CMD.StartInfo.CreateNoWindow = True
+        End Select
+
+        CMD.StartInfo.WorkingDirectory = IO.Path.GetDirectoryName(fileToRun)
+        'CMD.StartInfo.RedirectStandardInput = True
+        'CMD.StartInfo.RedirectStandardOutput = True
+        CMD.Start()
+    End Function
     ''' <summary>
     ''' Calls python.exe to run the gw.py script (Or run gw.exe directly in later versions)
     ''' </summary>
@@ -554,14 +577,7 @@ Public Class frmMain
                 End If
 
                 If oktorun Then
-                    Dim inStartInfo As New ProcessStartInfo
-                    inStartInfo.Arguments = fName
-                    inStartInfo.FileName = txtExecuteScript.Text.Trim
-                    inStartInfo.WindowStyle = ProcessWindowStyle.Normal
-                    If chkExecuteScript.CheckState = CheckState.Indeterminate Then
-                        inStartInfo.WindowStyle = ProcessWindowStyle.Minimized
-                    End If
-                    System.Diagnostics.Process.Start(inStartInfo)
+                    ExecuteCommand(txtExecuteScript.Text.Trim, fName, chkExecuteScript.CheckState)
                 End If
             End If
         End If
@@ -731,7 +747,7 @@ Public Class frmMain
     End Sub
 
     Private Sub LinkLabelLaunchNow_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabelLaunchNow.LinkClicked
-        System.Diagnostics.Process.Start(txtExecuteScript.Text.Trim, txtSaveLocation.Text.Trim + CreateFileName(False))
+        ExecuteCommand(txtExecuteScript.Text.Trim, txtSaveLocation.Text.Trim + CreateFileName(False), chkExecuteScript.CheckState)
     End Sub
 
     Private Sub ChkStartCyl_CheckedChanged(sender As Object, e As EventArgs) Handles ChkStartTrack.CheckedChanged