From 4f2f696d60e84b4a8ee5864a21429e4cd2c62d22 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 19 Aug 2018 12:55:55 -0700 Subject: [PATCH] Adjust backup paths for cleanup functions --- .bin/Scripts/functions/cleanup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bin/Scripts/functions/cleanup.py b/.bin/Scripts/functions/cleanup.py index bd2e3ec2..a604a47c 100644 --- a/.bin/Scripts/functions/cleanup.py +++ b/.bin/Scripts/functions/cleanup.py @@ -24,7 +24,7 @@ def cleanup_adwcleaner(): # Main folder if os.path.exists(source_path): os.makedirs(global_vars['ProgBackupDir'], exist_ok=True) - dest_name = r'{ProgBackupDir}\AdwCleaner_{Date-Time}'.format( + dest_name = r'{ProgBackupDir}\{Date}\AdwCleaner\{Date-Time}'.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}\Desktop_{Date-Time}'.format(**global_vars) + dest_folder = r'{ProgBackupDir}\{Date}\Desktop\{Date-Time}'.format(**global_vars) os.makedirs(dest_folder, exist_ok=True) desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])