From c78172ede064fb72f8a0f249b989c1dcdf674fac Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Wed, 22 Nov 2017 19:32:37 -0800 Subject: [PATCH] Print script titles to start Python scripts --- .bin/Scripts/activate.py | 2 ++ .bin/Scripts/cbs_fix.py | 4 ++-- .bin/Scripts/check_disk.py | 6 +++--- .bin/Scripts/dism.py | 6 +++--- .bin/Scripts/install_sw_bundle.py | 1 + .bin/Scripts/safemode_enter.py | 2 ++ .bin/Scripts/safemode_exit.py | 2 ++ .bin/Scripts/sfc_scan.py | 4 +++- .bin/Scripts/system_checklist.py | 3 ++- .bin/Scripts/system_diagnostics.py | 3 ++- .bin/Scripts/transferred_keys.py | 6 ++++-- .bin/Scripts/update_kit.py | 5 ++--- .bin/Scripts/user_checklist.py | 1 + .bin/Scripts/user_data_transfer.py | 7 ++++--- 14 files changed, 33 insertions(+), 19 deletions(-) diff --git a/.bin/Scripts/activate.py b/.bin/Scripts/activate.py index 29dac590..f5f768ad 100644 --- a/.bin/Scripts/activate.py +++ b/.bin/Scripts/activate.py @@ -19,6 +19,8 @@ def activate_with_bios(): if __name__ == '__main__': try: stay_awake() + os.system('cls') + print_info('{}: Windows Activation Tool\n'.format(KIT_NAME_FULL)) # Bail early if already activated if windows_is_activated(): print_info('This system is already activated') diff --git a/.bin/Scripts/cbs_fix.py b/.bin/Scripts/cbs_fix.py index ab3ba01c..189230e1 100644 --- a/.bin/Scripts/cbs_fix.py +++ b/.bin/Scripts/cbs_fix.py @@ -1,4 +1,4 @@ -# Wizard Kit: Copy user data to the system over the network +# Wizard Kit: Backup CBS Logs and prep CBS temp data for deletion import os import sys @@ -16,8 +16,8 @@ if __name__ == '__main__': try: # Prep stay_awake() - get_ticket_number() os.system('cls') + print_info('{}: CBS Cleanup Tool\n'.format(KIT_NAME_FULL)) folder_path = r'{}\Backups'.format(KIT_NAME_SHORT) dest = select_destination(folder_path=folder_path, prompt='Which disk are we using for temp data and backup?') diff --git a/.bin/Scripts/check_disk.py b/.bin/Scripts/check_disk.py index f233f544..69ff430f 100644 --- a/.bin/Scripts/check_disk.py +++ b/.bin/Scripts/check_disk.py @@ -14,6 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\Check Disk.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() + os.system('cls') other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', @@ -27,9 +28,8 @@ if __name__ == '__main__': {'Name': 'Schedule CHKDSK scan (offline repair)', 'Repair': True}] actions = [{'Name': 'Quit', 'Letter': 'Q'}] selection = menu_select( - 'Please select action to perform', options, actions) - os.system('cls') - print_info('Check Disk Tool') + '{}: Check Disk Menu\n'.format(KIT_NAME_FULL), options, actions) + print_info('{}: Check Disk Menu\n'.format(KIT_NAME_FULL)) if selection == 'Q': abort() elif selection.isnumeric(): diff --git a/.bin/Scripts/dism.py b/.bin/Scripts/dism.py index d9c6d7bf..0e088f30 100644 --- a/.bin/Scripts/dism.py +++ b/.bin/Scripts/dism.py @@ -14,6 +14,7 @@ global_vars['LogFile'] = r'{LogDir}\DISM helper tool.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() + os.system('cls') other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', @@ -27,9 +28,8 @@ if __name__ == '__main__': {'Name': 'Restore Health', 'Repair': True}] actions = [{'Name': 'Quit', 'Letter': 'Q'}] selection = menu_select( - 'Please select action to perform', options, actions) - os.system('cls') - print_info('DISM helper tool') + '{}: DISM Menu\n'.format(KIT_NAME_FULL), options, actions) + print_info('{}: DISM Menu\n'.format(KIT_NAME_FULL)) if selection == 'Q': abort() elif selection.isnumeric(): diff --git a/.bin/Scripts/install_sw_bundle.py b/.bin/Scripts/install_sw_bundle.py index 9eefe056..e1498e82 100644 --- a/.bin/Scripts/install_sw_bundle.py +++ b/.bin/Scripts/install_sw_bundle.py @@ -15,6 +15,7 @@ if __name__ == '__main__': try: stay_awake() os.system('cls') + print_info('{}: SW Bundle Tool\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', diff --git a/.bin/Scripts/safemode_enter.py b/.bin/Scripts/safemode_enter.py index 48fe4cc2..80a0094a 100644 --- a/.bin/Scripts/safemode_enter.py +++ b/.bin/Scripts/safemode_enter.py @@ -15,6 +15,8 @@ os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: + os.system('cls') + print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL)) if ask('Enable booting to SafeMode (with Networking)?'): # Edit BCD to set safeboot as default cmd = ['bcdedit', '/set', '{default}', 'safeboot', 'network'] diff --git a/.bin/Scripts/safemode_exit.py b/.bin/Scripts/safemode_exit.py index 579fa98a..35b4d38b 100644 --- a/.bin/Scripts/safemode_exit.py +++ b/.bin/Scripts/safemode_exit.py @@ -15,6 +15,8 @@ os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: + os.system('cls') + print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL)) if ask('Disable booting to SafeMode?'): # Edit BCD to remove safeboot value for boot in ['{current}', '{default}']: diff --git a/.bin/Scripts/sfc_scan.py b/.bin/Scripts/sfc_scan.py index e3288c09..1590671e 100644 --- a/.bin/Scripts/sfc_scan.py +++ b/.bin/Scripts/sfc_scan.py @@ -13,6 +13,9 @@ global_vars['LogFile'] = r'{LogDir}\SFC Tool.log'.format(**global_vars) if __name__ == '__main__': try: + stay_awake() + os.system('cls') + print_info('{}: SFC Tool\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', @@ -20,7 +23,6 @@ if __name__ == '__main__': 'Warning': { 'GenericRepair': 'Repaired', }} - stay_awake() try_and_print(message='SFC scan...', function=run_sfc_scan, other_results=other_results) diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py index d87e6e82..4ba60db3 100644 --- a/.bin/Scripts/system_checklist.py +++ b/.bin/Scripts/system_checklist.py @@ -18,8 +18,9 @@ global_vars['LogFile'] = r'{LogDir}\System Checklist.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() - ticket_number = get_ticket_number() os.system('cls') + print_info('{}: System Checklist Tool\n'.format(KIT_NAME_FULL)) + ticket_number = get_ticket_number() other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py index e3d2e41e..e6b9820e 100644 --- a/.bin/Scripts/system_diagnostics.py +++ b/.bin/Scripts/system_diagnostics.py @@ -19,8 +19,9 @@ global_vars['LogFile'] = r'{LogDir}\System Diagnostics.log'.format( if __name__ == '__main__': try: stay_awake() - ticket_number = get_ticket_number() os.system('cls') + print_info('{}: System Diagnostics Tool\n'.format(KIT_NAME_FULL)) + ticket_number = get_ticket_number() other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', diff --git a/.bin/Scripts/transferred_keys.py b/.bin/Scripts/transferred_keys.py index 0f0422db..8533b16e 100644 --- a/.bin/Scripts/transferred_keys.py +++ b/.bin/Scripts/transferred_keys.py @@ -1,4 +1,4 @@ -# Wizard Kit: Search for product keys in the transfer folder via ProduKey & SW hives +# Wizard Kit: Search for product keys in the transfer folder import os import sys @@ -8,12 +8,14 @@ os.chdir(os.path.dirname(os.path.realpath(__file__))) sys.path.append(os.getcwd()) from functions.product_keys import * init_global_vars() -os.system('title {}: ProductKey Tool'.format(KIT_NAME_FULL)) +os.system('title {}: Transferred Key Finder'.format(KIT_NAME_FULL)) global_vars['LogFile'] = r'{LogDir}\Transferred Keys.log'.format(**global_vars) if __name__ == '__main__': try: stay_awake() + os.system('cls') + print_info('{}: Transferred Key Finder\n'.format(KIT_NAME_FULL)) try_and_print(message='Searching for keys...', function=list_clientdir_keys, print_return=True) diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index d2ab9c37..152f8276 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -12,13 +12,12 @@ os.system('title {}: Kit Update Tool'.format(KIT_NAME_FULL)) if __name__ == '__main__': try: + os.system('cls') + print_info('{}: Kit Update Tool\n'.format(KIT_NAME_FULL)) other_results = { 'Error': { 'CalledProcessError': 'Unknown Error', }} - stay_awake() - os.system('cls') - print_info('Starting {} Full Update\n'.format(KIT_NAME_FULL)) ## Prep ## update_sdio = ask('Update SDI Origin?') diff --git a/.bin/Scripts/user_checklist.py b/.bin/Scripts/user_checklist.py index 9e488e4b..b70c4b1d 100644 --- a/.bin/Scripts/user_checklist.py +++ b/.bin/Scripts/user_checklist.py @@ -18,6 +18,7 @@ if __name__ == '__main__': try: stay_awake() os.system('cls') + print_info('{}: User Checklist\n'.format(KIT_NAME_FULL)) other_results = { 'Warning': { 'NotInstalledError': 'Not installed', diff --git a/.bin/Scripts/user_data_transfer.py b/.bin/Scripts/user_data_transfer.py index e0df19a6..cd6b2605 100644 --- a/.bin/Scripts/user_data_transfer.py +++ b/.bin/Scripts/user_data_transfer.py @@ -9,15 +9,16 @@ sys.path.append(os.getcwd()) from functions.data import * from functions.repairs import * init_global_vars() -os.system('title {}: Data 1'.format(KIT_NAME_FULL)) -global_vars['LogFile'] = r'{LogDir}\Data 1.log'.format(**global_vars) +os.system('title {}: User Data Transfer Tool'.format(KIT_NAME_FULL)) +global_vars['LogFile'] = r'{LogDir}\User Data Transfer.log'.format(**global_vars) if __name__ == '__main__': try: # Prep stay_awake() - ticket_number = get_ticket_number() os.system('cls') + print_info('{}: User Data Transfer Tool\n'.format(KIT_NAME_FULL)) + ticket_number = get_ticket_number() folder_path = r'{}\Transfer'.format(KIT_NAME_SHORT) dest = select_destination(folder_path=folder_path, prompt='Which disk are we transferring to?')