Browse Source

Remove residual temp folder on error when restoring user backup

Robert Zollner 6 years ago
parent
commit
b5a224c5a8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      bin/v-restore-user

+ 2 - 0
bin/v-restore-user

@@ -768,6 +768,7 @@ if [ "$udir" != 'no' ]; then
             echo -e "$(date "+%F %T") $user_dir" |tee -a $tmpdir/restore.log
             echo -e "$(date "+%F %T") $user_dir" |tee -a $tmpdir/restore.log
             tar xf "$BACKUP/$backup" -C "$tmpdir" --no-wildcards "./user_dir/$user_dir.tar.gz"
             tar xf "$BACKUP/$backup" -C "$tmpdir" --no-wildcards "./user_dir/$user_dir.tar.gz"
             if [ "$?" -ne 0 ]; then
             if [ "$?" -ne 0 ]; then
+                rm -rf $tmpdir
                 error="Can't unpack $user_dir user dir container"
                 error="Can't unpack $user_dir user dir container"
                 echo "$error" |$SENDMAIL -s "$subj" $email $notify
                 echo "$error" |$SENDMAIL -s "$subj" $email $notify
                 sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
                 sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
@@ -781,6 +782,7 @@ if [ "$udir" != 'no' ]; then
             cmdstatus="$?"
             cmdstatus="$?"
             chown root:root "$HOMEDIR/$user"
             chown root:root "$HOMEDIR/$user"
             if [ "$cmdstatus" -ne 0 ]; then
             if [ "$cmdstatus" -ne 0 ]; then
+                rm -rf $tmpdir
                 error="Can't unpack $user_dir user dir container"
                 error="Can't unpack $user_dir user dir container"
                 echo "$error" |$SENDMAIL -s "$subj" $email $notify
                 echo "$error" |$SENDMAIL -s "$subj" $email $notify
                 sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
                 sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe