From 3d1c88ffbff6543f08f8a9528acd3034ade9afcc Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 28 Mar 2014 11:22:14 +0200 Subject: [PATCH] fix for database duplicates in restore loop --- bin/v-restore-user | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/v-restore-user b/bin/v-restore-user index a695e603..a2ec47ed 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -611,9 +611,8 @@ if [ "$db" != 'no' ]; then echo "-- 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 db_include_list=$(mktemp) for db_include in ${db//,/ }; do @@ -622,6 +621,8 @@ if [ "$db" != 'no' ]; then db_list=$(echo "$db_list" | egrep -f $db_include_list ) rm -f $db_include_list fi + echo "$db_list" + exit for db in $db_list; do