From cca121bbaa221f54d4ab4146350d25cac15f9e44 Mon Sep 17 00:00:00 2001
From: CorpNewt <12772521+corpnewt@users.noreply.github.com>
Date: Tue, 29 Dec 2020 05:19:32 -0600
Subject: [PATCH 1/3] Update MakeInstall.bat

---
 MakeInstall.bat | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MakeInstall.bat b/MakeInstall.bat
index 04655d9..1a5d918 100644
--- a/MakeInstall.bat
+++ b/MakeInstall.bat
@@ -1,9 +1,10 @@
 @echo off
-setlocal enableDelayedExpansion
+REM Get our local path before delayed expansion - allows ! in path
+set "thisDir=%~dp0"
 
+setlocal enableDelayedExpansion
 REM Setup initial vars
 set "script_name="
-set "thisDir=%~dp0"
 set /a tried=0
 set "toask=yes"
 set "pause_on_error=yes"

From c73042f4754f5503418fc9db171c26071c1e1d8e Mon Sep 17 00:00:00 2001
From: CorpNewt <12772521+corpnewt@users.noreply.github.com>
Date: Tue, 29 Dec 2020 05:19:49 -0600
Subject: [PATCH 2/3] Update gibMacOS.bat

---
 gibMacOS.bat | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gibMacOS.bat b/gibMacOS.bat
index 04655d9..1a5d918 100644
--- a/gibMacOS.bat
+++ b/gibMacOS.bat
@@ -1,9 +1,10 @@
 @echo off
-setlocal enableDelayedExpansion
+REM Get our local path before delayed expansion - allows ! in path
+set "thisDir=%~dp0"
 
+setlocal enableDelayedExpansion
 REM Setup initial vars
 set "script_name="
-set "thisDir=%~dp0"
 set /a tried=0
 set "toask=yes"
 set "pause_on_error=yes"

From 9a683e716faef22c05183095ebc38c3611b16295 Mon Sep 17 00:00:00 2001
From: CorpNewt <12772521+corpnewt@users.noreply.github.com>
Date: Tue, 29 Dec 2020 12:03:55 -0600
Subject: [PATCH 3/3] Fix UAC elevation issues with space in path

---
 Scripts/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/utils.py b/Scripts/utils.py
index 9ee4b30..08a453f 100755
--- a/Scripts/utils.py
+++ b/Scripts/utils.py
@@ -33,7 +33,7 @@ class Utils:
         if self.check_admin():
             return
         if os.name == "nt":
-            ctypes.windll.shell32.ShellExecuteW(None, "runas", sys.executable, file, None, 1)
+            ctypes.windll.shell32.ShellExecuteW(None, "runas", '"{}"'.format(sys.executable), '"{}"'.format(file), None, 1)
         else:
             try:
                 p = subprocess.Popen(["which", "sudo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)