diff --git a/.bin/Scripts/functions/data.py b/.bin/Scripts/functions/data.py index 3222b880..d02af97d 100644 --- a/.bin/Scripts/functions/data.py +++ b/.bin/Scripts/functions/data.py @@ -211,10 +211,10 @@ def run_wimextract(source, items, dest): extract_item('wimlib', silent=True) # Write files.txt - with open(r'{TmpDir}\wim_files.txt'.format(**global_vars), 'w') as f: + with open(r'{}\wim_files.txt'.format(global_vars['TmpDir']), 'w') as f: # Defaults for item in items: - f.write('{item}\n'.format(item=item)) + f.write('{}\n'.format(item)) sleep(1) # For safety? # Extract files @@ -222,7 +222,7 @@ def run_wimextract(source, items, dest): global_vars['Tools']['wimlib-imagex'], 'extract', source, '1', - r'@{TmpDir}\wim_files.txt'.format(**global_vars), + r'@{}\wim_files.txt'.format(global_vars['TmpDir']), '--dest-dir={}\\'.format(dest), '--no-acls', '--nullglob'] diff --git a/.bin/Scripts/user_data_transfer.py b/.bin/Scripts/user_data_transfer.py index 20dec730..40a5a63a 100644 --- a/.bin/Scripts/user_data_transfer.py +++ b/.bin/Scripts/user_data_transfer.py @@ -39,7 +39,7 @@ if __name__ == '__main__': print_info('Transferring Data') transfer_source(source, dest, items) try_and_print(message='Removing extra files...', - function=cleanup_transfer, cs='Done') + function=cleanup_transfer, cs='Done', dest_path=dest) umount_backup_shares() # Done