rm tmp backup dir

Author: yungwine

modules/backups.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 import time
 
@@ -30,8 +31,8 @@ def create_backup(self, args):
         if len(args) > 1:
             color_print("{red}Bad args. Usage:{endc} create_backup [filename]")
             return
-        dir_ = self.create_tmp_ton_dir()
-        command_args = ["-m", self.ton.local.buffer.my_work_dir, "-t", dir_]
+        tmp_dir = self.create_tmp_ton_dir()
+        command_args = ["-m", self.ton.local.buffer.my_work_dir, "-t", tmp_dir]
         if len(args) == 1:
             command_args += ["-d", args[0]]
         backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
@@ -41,6 +42,7 @@ def create_backup(self, args):
             color_print("create_backup - {green}OK{endc}")
         else:
             color_print("create_backup - {red}Error{endc}")
+        shutil.rmtree(tmp_dir)
         return process.returncode
     # end define
 

mytoncore/mytoncore.py

@@ -1467,7 +1467,8 @@ def clear_dir(self, dir_name):
 			ts = os.path.getmtime(os.path.join(dir_name, f))
 			if ts < time.time() - week_ago:
 				count += 1
-				os.remove(os.path.join(dir_name, f))
+				if os.path.isfile(os.path.join(dir_name, f)):
+					os.remove(os.path.join(dir_name, f))
 		self.local.add_log(f"Removed {count} old files from {dir_name} directory for {int(time.time() - start)} seconds", "info")
 
 	def clear_tmp(self):

mytonctrl/scripts/create_backup.sh

@@ -33,13 +33,14 @@ cp -r $mtc_dir $tmp_dir
 python3 -c "import json;f=open('${tmp_dir}/db/config.json');json.load(f);f.close()" || exit 1  # Check if config.json is copied correctly
 python3 -c "import json;f=open('${tmp_dir}/mytoncore/mytoncore.db');json.load(f);f.close()" || exit 2  # Check if mytoncore.db is copied correctly
 
-echo -e "${COLOR}[1/3]${ENDC} Copied files to ${tmp_dir}"
-
-echo -e "${COLOR}[2/3]${ENDC} Started mytoncore service"
+echo -e "${COLOR}[1/2]${ENDC} Copied files to ${tmp_dir}"
 
 tar -zcf $dest -C $tmp_dir .
 
 chown $user:$user $dest
 
-echo -e "${COLOR}[3/3]${ENDC} Backup successfully created in ${dest}!"
+echo -e "${COLOR}[2/2]${ENDC} Backup successfully created in ${dest}!"
+
+rm -rf $tmp_dir
+
 echo -e "If you wish to use archive package to migrate node to different machine please make sure to stop validator and mytoncore on donor (this) host prior to migration."