Skip to content

Commit 88e6346

Browse files
committed
Fix format
1 parent 3471e66 commit 88e6346

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

bin/v-import-directadmin

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ echo "Start with databases"
178178
tput sgr0
179179

180180
echo "Get local databases"
181-
mysql -e "SHOW DATABASES" >server_dbs
181+
mysql -e "SHOW DATABASES" > server_dbs
182182
da_db_list=$(ls -1 backup/ | grep ".conf")
183183
function run_da_db() {
184184
for da_db in $da_db_list; do
@@ -195,7 +195,7 @@ function run_da_db() {
195195
echo " Create and restore ${db} "
196196
tput sgr0
197197
mysql -e "CREATE DATABASE $db"
198-
mysql ${db} <backup/${db}.sql
198+
mysql ${db} < backup/${db}.sql
199199
#Get all the users of the database
200200
while IFS= read -r line; do
201201

@@ -209,10 +209,10 @@ function run_da_db() {
209209
echo "udb: $db_user"
210210
echo "Password: ${md5}"
211211

212-
echo "DB='$db' DBUSER='$db_user' MD5='$md5' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='$time' DATE='$data'" >>/usr/local/hestia/data/users/$directadmin_user/db.conf
212+
echo "DB='$db' DBUSER='$db_user' MD5='$md5' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='$time' DATE='$data'" >> /usr/local/hestia/data/users/$directadmin_user/db.conf
213213
fi
214214

215-
done <"backup/${da_db}"
215+
done < "backup/${da_db}"
216216

217217
# Leave hestia restore passwords and create users
218218
tput setaf 2
@@ -257,13 +257,13 @@ for directadmin_domain in $directadmin_domain_list; do
257257
tput sgr0
258258
elif [ -d /home/${directadmin_user}/web/${directadmin_domain} ]; then
259259
echo "Domain $directadmin_domain added, restoring files"
260-
echo $directadmin_domain >>restored_domains
260+
echo $directadmin_domain >> restored_domains
261261
rm -f /home/$directadmin_user/web/$directadmin_domain/public_html/index.html
262262
rm -f /home/$directadmin_user/web/$directadmin_domain/public_html/robots.txt
263263

264264
public_sync_count=0
265-
rsync -av domains/${directadmin_domain}/public_html/ /home/$directadmin_user/web/$directadmin_domain/public_html 2>&1 |
266-
while read file_dm; do
265+
rsync -av domains/${directadmin_domain}/public_html/ /home/$directadmin_user/web/$directadmin_domain/public_html 2>&1 \
266+
| while read file_dm; do
267267
public_sync_count=$(($public_sync_count + 1))
268268
echo -en "-- $public_sync_count restored files\r"
269269
done
@@ -276,8 +276,8 @@ for directadmin_domain in $directadmin_domain_list; do
276276
else
277277
private_sync_count=0
278278

279-
rsync -av domains/${directadmin_domain}/private_html/ /home/$directadmin_user/web/$directadmin_domain/private 2>&1 |
280-
while read file_dm; do
279+
rsync -av domains/${directadmin_domain}/private_html/ /home/$directadmin_user/web/$directadmin_domain/private 2>&1 \
280+
| while read file_dm; do
281281
private_sync_count=$(($private_sync_count + 1))
282282
echo -en "-- $private_sync_count restored files\r"
283283
done
@@ -317,8 +317,8 @@ if [ -e restored_domains ]; then
317317
tmp_pass=$(generate_password)
318318
$BIN/v-add-mail-account $directadmin_user $da_mail_domain $da_imap tmp_pass
319319
if [ "$debug" != 0 ]; then
320-
rsync -av imap/${da_mail_domain}/${da_imap}/Maildir/ /home/${directadmin_user}/mail/${da_mail_domain}/${da_imap} 2>&1 |
321-
while read backup_file_dm; do
320+
rsync -av imap/${da_mail_domain}/${da_imap}/Maildir/ /home/${directadmin_user}/mail/${da_mail_domain}/${da_imap} 2>&1 \
321+
| while read backup_file_dm; do
322322
sk_sync=$((sk_sync + 1))
323323
echo -en "-- $sk_sync restored files\r"
324324
done

0 commit comments

Comments
 (0)