From a9822ae9bde80660739455c761335ee2c4c1d3d1 Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Fri, 1 Dec 2017 13:31:42 -0800
Subject: [PATCH] Bugfix Tool paths

---
 .bin/Scripts/functions/winpe_menus.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.bin/Scripts/functions/winpe_menus.py b/.bin/Scripts/functions/winpe_menus.py
index d22827ed..130d5eb1 100644
--- a/.bin/Scripts/functions/winpe_menus.py
+++ b/.bin/Scripts/functions/winpe_menus.py
@@ -50,6 +50,16 @@ PE_TOOLS = {
         },
     }
 
+def check_pe_tools():
+    for k in PE_TOOLS.keys():
+        PE_TOOLS[k]['Path'] = r'{}\{}'.format(
+            global_vars['BinDir'], PE_TOOLS[k]['Path'])
+    global_vars['Tools']['wimlib-imagex'] = re.sub(
+        r'\\x(32|64)',
+        r'',
+        global_vars['Tools']['wimlib-imagex'],
+        re.IGNORECASE)
+
 def menu_backup():
     """Take backup images of partition(s) in the WIM format."""
     errors = False
@@ -175,11 +185,7 @@ def menu_backup():
     pause('\nPress Enter to return to main menu... ')
 
 def menu_root():
-    # Fix PE_TOOLS paths
-    for k in PE_TOOLS.keys():
-        PE_TOOLS[k]['Path'] = r'{}\{}'.format(
-            global_vars['BinDir'], PE_TOOLS[k]['Path'])
-    
+    check_pe_tools()
     menus = [
         {'Name': 'Create Backups', 'Menu': menu_backup},
         {'Name': 'Setup Windows', 'Menu': menu_setup},