Added set_log_file()

.bin/Scripts/cbs_fix.py

@@ -10,8 +10,7 @@ from functions.cleanup import *
 from functions.data import *
 init_global_vars()
 os.system('title {}: CBS Cleanup'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\CBS Cleanup.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('CBS Cleanup.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/check_disk.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: Check Disk Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Check Disk.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('Check Disk.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/dism.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: DISM helper Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\DISM Helper.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('DISM Helper.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/functions/common.py

@@ -758,6 +758,9 @@ def make_tmp_dirs():
     """Make temp directories."""
     os.makedirs(global_vars['BackupDir'], exist_ok=True)
     os.makedirs(global_vars['LogDir'], exist_ok=True)
+    os.makedirs(r'{}\{}'.format(
+        global_vars['LogDir'], KIT_NAME_FULL), exist_ok=True)
+    os.makedirs(r'{}\Tools'.format(global_vars['LogDir']), exist_ok=True)
     os.makedirs(global_vars['TmpDir'], exist_ok=True)
 
 def set_common_vars():
@@ -798,5 +801,12 @@ def set_linux_vars():
         'SevenZip': '7z',
         }
 
+def set_log_file(log_name):
+    """Sets global var LogFile and creates path as needed."""
+    folder_path = r'{}\{}'.format(global_vars['LogDir'], KIT_NAME_FULL)
+    log_file = r'{}\{}'.format(folder_path, log_name)
+    os.makedirs(folder_path, exist_ok=True)
+    global_vars['LogFile'] = log_file
+
 if __name__ == '__main__':
     print("This file is not meant to be called directly.")

.bin/Scripts/install_eset_nod32_av.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.setup import *
 init_global_vars()
 os.system('title {}: Install ESET NOD32 AV'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Install ESET NOD32 AV.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('Install ESET NOD32 AV.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/install_sw_bundle.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.setup import *
 init_global_vars()
 os.system('title {}: SW Bundle Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Install SW Bundle.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('Install SW Bundle.log')
 D7_MODE = 'd7mode' in sys.argv
 
 if __name__ == '__main__':

.bin/Scripts/install_vcredists.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.setup import *
 init_global_vars()
 os.system('title {}: Install Visual C++ Runtimes'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Install Visual C++ Runtimes.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('Install Visual C++ Runtimes.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/post_d7.py

@@ -11,8 +11,7 @@ from functions.cleanup import *
 from functions.setup import *
 init_global_vars()
 os.system('title {}: Post-d7II Work'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Post-d7II Work.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('Post-d7II Work.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/reset_browsers.py

@@ -11,8 +11,7 @@ from functions.cleanup import *
 from functions.setup import *
 init_global_vars()
 os.system('title {}: Browser Reset Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Browser Reset ({USERNAME}).log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars, **global_vars['Env'])
+set_log_file('Browser Reset ({USERNAME}).log'.format(**global_vars['Env']))
 D7_MODE = 'd7mode' in sys.argv
 
 if __name__ == '__main__':

.bin/Scripts/sfc_scan.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: SFC Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\SFC Tool.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('SFC Tool.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/system_checklist.py

@@ -14,8 +14,7 @@ from functions.product_keys import *
 from functions.setup import *
 init_global_vars()
 os.system('title {}: System Checklist Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\System Checklist.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('System Checklist.log')
 D7_MODE = 'd7mode' in sys.argv
 
 if __name__ == '__main__':

.bin/Scripts/system_checklist_hw.py

@@ -14,8 +14,7 @@ from functions.product_keys import *
 from functions.setup import *
 init_global_vars()
 os.system('title {}: System HW Checklist Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\System HW Checklist.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('System HW Checklist.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/system_diagnostics.py

@@ -13,8 +13,7 @@ from functions.product_keys import *
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: System Diagnostics Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\System Diagnostics.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('System Diagnostics.log')
 D7_MODE = 'd7mode' in sys.argv
 
 # Static Variables

.bin/Scripts/transferred_keys.py

@@ -9,8 +9,7 @@ sys.path.append(os.getcwd())
 from functions.product_keys import *
 init_global_vars()
 os.system('title {}: Transferred Key Finder'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\Transferred Keys.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('Transferred Keys.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/user_checklist.py

@@ -11,8 +11,7 @@ from functions.cleanup import *
 from functions.setup import *
 init_global_vars()
 os.system('title {}: User Checklist Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\User Checklist ({USERNAME}).log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars, **global_vars['Env'])
+set_log_file('User Checklist ({USERNAME}).log'.format(**global_vars['Env']))
 D7_MODE = 'd7mode' in sys.argv
 
 if __name__ == '__main__':

.bin/Scripts/user_data_transfer.py

@@ -10,8 +10,7 @@ from functions.data import *
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: User Data Transfer Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\{kit_name}\User Data Transfer.log'.format(
-    kit_name=KIT_NAME_FULL, **global_vars)
+set_log_file('User Data Transfer.log')
 
 if __name__ == '__main__':
     try:

.bin/Scripts/winpe_root_menu.py

@@ -11,7 +11,7 @@ from functions.winpe_menus import *
 TOOLS['SevenZip'].pop('64')
 init_global_vars()
 set_title('{}: Root Menu'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\WinPE.log'.format(**global_vars)
+set_log_file('WinPE.log')
 
 if __name__ == '__main__':
     try: