Преглед изворни кода

[Bug] Deleting backups doesn't work (Local, FTP) (#1421)

* Issue as  $BACKUP get overwritten by parse_object_kv_list
* Fix issue with ftp removal
Jaap Marcus пре 5 година
родитељ
комит
cbccb0a572
1 измењених фајлова са 6 додато и 4 уклоњено
  1. 6 4
      bin/v-delete-user-backup

+ 6 - 4
bin/v-delete-user-backup

@@ -37,23 +37,25 @@ is_object_valid 'backup' 'BACKUP' "$2"
 # Perform verification if read-only mode is enabled
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
 check_hestia_demo_mode
 
 
-
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                       Action                             #
 #                       Action                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
+backup_folder=$BACKUP
+
 line=$(grep "BACKUP='$backup'" $USER_DATA/backup.conf)
 line=$(grep "BACKUP='$backup'" $USER_DATA/backup.conf)
 parse_object_kv_list "$line"
 parse_object_kv_list "$line"
 
 
-
+deleted=0
 if [[ "$TYPE" =~ "sftp" ]]; then
 if [[ "$TYPE" =~ "sftp" ]]; then
     sftp_delete "$backup"
     sftp_delete "$backup"
+    deleted=1
 fi
 fi
 if [[ "$TYPE" =~ "ftp" ]] && [ "$deleted" == "0" ]; then
 if [[ "$TYPE" =~ "ftp" ]] && [ "$deleted" == "0" ]; then
-    ftp_delete "backup"
+    ftp_delete "$backup"
 fi
 fi
 if [[ "$TYPE" =~ "local" ]]; then
 if [[ "$TYPE" =~ "local" ]]; then
-    rm -f $BACKUP/$2
+    rm -f $backup_folder/$2
 fi
 fi
 
 
 # Deleting backup
 # Deleting backup