Explorar o código

fix for database duplicates in restore loop

Serghey Rodin %!s(int64=12) %!d(string=hai) anos
pai
achega
3d1c88ffbf
Modificáronse 1 ficheiros con 4 adicións e 3 borrados
  1. 4 3
      bin/v-restore-user

+ 4 - 3
bin/v-restore-user

@@ -611,9 +611,8 @@ if [ "$db" != 'no' ]; then
     echo "-- DB --"
     echo "-- DB --"
     msg="$msg\n-- DB --"
     msg="$msg\n-- DB --"
 
 
-    # Create domain list
-    db_list=$(tar -tf $BACKUP/$backup | grep "^./db" |\
-        grep db.conf | cut -f 3 -d '/')
+    # Create database list
+    db_list=$(tar -tf $BACKUP/$backup | grep "/db.conf$" | cut -f 3 -d '/')
     if [ ! -z "$db" ]; then
     if [ ! -z "$db" ]; then
         db_include_list=$(mktemp)
         db_include_list=$(mktemp)
         for db_include in ${db//,/ }; do
         for db_include in ${db//,/ }; do
@@ -622,6 +621,8 @@ if [ "$db" != 'no' ]; then
         db_list=$(echo "$db_list" | egrep -f $db_include_list )
         db_list=$(echo "$db_list" | egrep -f $db_include_list )
         rm -f $db_include_list
         rm -f $db_include_list
     fi
     fi
+    echo "$db_list"
+    exit
 
 
     for db in $db_list; do
     for db in $db_list; do