From 47d589a1bacc4cf70e752206946de453c9c66491 Mon Sep 17 00:00:00 2001 From: myvesta <38690722+myvesta@users.noreply.github.com> Date: Fri, 8 May 2020 13:55:18 +0200 Subject: [PATCH] Update v-clone-website --- src/deb/for-download/tools/v-clone-website | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/deb/for-download/tools/v-clone-website b/src/deb/for-download/tools/v-clone-website index 9b0aa94c..8a5c6a8d 100644 --- a/src/deb/for-download/tools/v-clone-website +++ b/src/deb/for-download/tools/v-clone-website @@ -31,6 +31,18 @@ TO_DATABASE_USERNAME='' TO_DATABASE_PASSWORD='' DATABASE_SUFIX='_migrated' +if [ -z "$1" ]; then + echo "Error: FROM_DOMAIN is empty" + exit 2 +fi +if [ -z "$2" ]; then + echo "Error: TO_DOMAIN is empty" + exit 3 +fi + +FROM_DOMAIN=$1 +TO_DOMAIN=$2 + ############################ # handle --parameters=val handle_parameter() { @@ -58,17 +70,8 @@ if [ -z "$VESTA" ]; then VESTA="/usr/local/vesta" fi -if [ -z "$1" ]; then - echo "Error: FROM_DOMAIN is empty" - exit 2 -fi -if [ -z "$2" ]; then - echo "Error: TO_DOMAIN is empty" - exit 3 -fi +########################################################################### - -FROM_DOMAIN=$1 FROM_USER=$($VESTA/bin/v-search-domain-owner "$FROM_DOMAIN") if [ -z "$FROM_USER" ]; then echo "Error: domain $FROM_DOMAIN does not exists" @@ -144,7 +147,6 @@ FROM_DATABASE_USERNAME_WITHOUT_PREFIX=${FROM_DATABASE_USERNAME:FROM_USER_LEN} CREATE_TO_USER=0 CREATE_TO_DOMAIN=0 -TO_DOMAIN=$2 if [ -z "$TO_USER" ]; then TO_USER=$($VESTA/bin/v-search-domain-owner "$TO_DOMAIN") if [ -z "$TO_USER" ]; then