From edb82df4d3d7c96a9b3bd8b1b04385ef999cb55f Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 19 Aug 2018 13:24:39 -0700 Subject: [PATCH] Move AdwCleaner/Desktop to LogDir during cleanup * Instead of ProgBackupDir --- .bin/Scripts/functions/cleanup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.bin/Scripts/functions/cleanup.py b/.bin/Scripts/functions/cleanup.py index 945938a9..c02e3665 100644 --- a/.bin/Scripts/functions/cleanup.py +++ b/.bin/Scripts/functions/cleanup.py @@ -23,8 +23,8 @@ def cleanup_adwcleaner(): # Main folder if os.path.exists(source_path): - os.makedirs(global_vars['ProgBackupDir'], exist_ok=True) - dest_name = r'{ProgBackupDir}\{Date}\AdwCleaner\{Date-Time}'.format( + os.makedirs(global_vars['LogDir'], exist_ok=True) + dest_name = r'{LogDir}\{Date}\AdwCleaner'.format( **global_vars) dest_name = non_clobber_rename(dest_name) shutil.move(source_path, dest_name) @@ -70,7 +70,7 @@ def cleanup_cbs(dest_folder): def cleanup_desktop(): """Move known backup files and reports into the ClientDir.""" - dest_folder = r'{ProgBackupDir}\{Date}\Desktop\{Date-Time}'.format(**global_vars) + dest_folder = r'{ProgBackupDir}\{Date}\Desktop'.format(**global_vars) os.makedirs(dest_folder, exist_ok=True) desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])