Просмотр исходного кода

Fix check if it was a vesta or hestia backup

Raphael Schneeberger 7 лет назад
Родитель
Сommit
a15eb4908d
1 измененных файлов с 9 добавлено и 9 удалено
  1. 9 9
      bin/v-restore-user

+ 9 - 9
bin/v-restore-user

@@ -249,15 +249,15 @@ if [ "$create_user" = 'yes' ]; then
     # Unpacking user container
     tar xf $BACKUP/$backup -C $tmpdir ./hestia
     if [ "$?" -ne 0 ]; then
-        rm -rf $tmpdir
-        echo "Can't unpack user contaner" |$SENDMAIL -s "$subj" $email $notify
-        sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
-        check_result "$E_PARSING" "can't unpack user contaner"
-    fi
-
-    # Check if it is a vesta or hestia backup
-    if [ -d "$tmpdir/vesta" ]; then
-        backup_system="vesta"
+        tar xf $BACKUP/$backup -C $tmpdir ./vesta
+        if [ "$?" -ne 0 ]; then
+            rm -rf $tmpdir
+            echo "Can't unpack user contaner" |$SENDMAIL -s "$subj" $email $notify
+            sed -i "/ $user /d" $HESTIA/data/queue/backup.pipe
+            check_result "$E_PARSING" "can't unpack user contaner"
+        else
+            backup_system="vesta"
+        fi
     else
         backup_system="hestia"
     fi