Site creation with EE Migrate

bin/easyengine

@@ -447,7 +447,9 @@ elif [ "$EE_FIRST" = "site" ]; then
         ee_lib_echo_info "HTTP authentication password: $(grep "HTTP authentication password:" $EE_COMMAND_LOG | tail -n1 | awk '{print $4}')"
 			fi
 			# Display Success Message
-			ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
+			if [ "$EE_MIGRATE" != "True" ]; then
+				ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
+			fi
 		elif [ "$EE_SITE_CREATE_OPTION" = "--wp" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
 			if [ "$EE_SITE_CACHE_OPTION" = "--basic" ] || [ "$EE_SITE_CACHE_OPTION" = "--wpsc" ] || [ "$EE_SITE_CACHE_OPTION" = "--w3tc" ] || [ "$EE_SITE_CACHE_OPTION" = "--wpfc" ]; then
 
@@ -459,8 +461,11 @@ elif [ "$EE_FIRST" = "site" ]; then
 				ee_lib_check_domain
 				ee_mod_setup_domain
 
-				# Setup WordPress
+				# If we are migrating site then Wordpress installation is not required
-				ee_mod_setup_wordpress
+				if [ "$EE_MIGRATE" != "True" ]; then
+					# Setup WordPress
+					ee_mod_setup_wordpress
+				fi
 
 				# Adjust permission
 				ee_lib_permissions
@@ -477,17 +482,19 @@ elif [ "$EE_FIRST" = "site" ]; then
         	ee_lib_echo_info "HTTP authentication password: $(grep "HTTP authentication password:" $EE_COMMAND_LOG | tail -n1 | awk '{print $4}')"
 				fi
 
-				# Display WordPress credential
+				if [ "$EE_MIGRATE" != "True" ]; then
-				echo
+					# Display WordPress credential
-				ee_lib_echo_info "WordPress Admin Username: $EE_WP_USER"
+					echo
-				ee_lib_echo_info "WordPress Admin Password: $EE_WP_PASS"
+					ee_lib_echo_info "WordPress Admin Username: $EE_WP_USER"
-				echo
+					ee_lib_echo_info "WordPress Admin Password: $EE_WP_PASS"
+					echo
 
-				# Display WordPress cache plugin settings
+					# Display WordPress cache plugin settings
-				ee_mod_plugin_settings
+					ee_mod_plugin_settings
 
-				# Display Success Message
+					# Display Success Message
-				ee_lib_echo_info "Successfully created new website: http://$EE_WWW_DOMAIN"
+					ee_lib_echo_info "Successfully created new website: http://$EE_WWW_DOMAIN"
+				fi
 			fi
 		fi
 	elif [ "$EE_SECOND" = "delete" ]; then
@@ -721,6 +728,8 @@ elif [ "$EE_FIRST" = "site" ]; then
 		fi
 
 	elif [ "$EE_SECOND" = "migrate" ]; then
+		export $EE_MIGRATE="True"
+
 		# Configure variables
 		EE_DOMAIN_CHECK=$EE_THIRD
 		ee_lib_check_domain
@@ -760,6 +769,9 @@ elif [ "$EE_FIRST" = "site" ]; then
 		# Migrate Data
 		ee_mod_migrate_data
 
+		# Create site
+		ee site create $EE_DOMAIN $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION
+
 	else
 		ee_lib_echo "ee site commands:"
 		ee_lib_echo_escape "\tcd\tSwitch to website root directory"

src/modules/site/migrate/ee_mod_migrate_data.sh

@@ -6,19 +6,19 @@ function ee_mod_migrate_data()
   if [ "$EE_REMOTE_METHOD" == "ssh" ]; then
     # Lets FTP or rsync files
     rsync -avz --progress $EE_REMOTE_USER@$EE_REMOTE_SERVER:$EE_REMOTE_PATH/ /ee-backup/$EE_DOMAIN/
-    if [ ! -f /ee-backup/$EE_DOMAIN/wp-config.php ]; then
+    if [ ! -f /ee-backup/$EE_DOMAIN/wp-config.php && "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" ]; then
       rsync -avz --progress $EE_REMOTE_USER@$EE_REMOTE_SERVER:$EE_REMOTE_PATH/../wp-config.php /ee-backup/$EE_DOMAIN/
     fi
 
   elif [ "$EE_REMOTE_METHOD" == "ftp" ]; then
     lftp -e "mirror --verbose -c $EE_REMOTE_PATH /ee-backup/$EE_DOMAIN; quit" ftp://$EE_REMOTE_USER@$EE_REMOTE_SERVER
-    if [ ! -f /ee-backup/$EE_DOMAIN/wp-config.php ]; then
+    if [ ! -f /ee-backup/$EE_DOMAIN/wp-config.php && "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" ]; then
       lftp -e "get -c $EE_REMOTE_PATH/../wp-config.php; quit" ftp://$EE_REMOTE_USER@$EE_REMOTE_SERVER
     fi
 
   elif [ "$EE_REMOTE_METHOD" == "sftp" ]; then
     lftp -e "mirror --verbose -c $EE_REMOTE_PATH /ee-backup/$EE_DOMAIN ; quit"; sftp://$EE_REMOTE_USER@$EE_REMOTE_SERVER
-    if [ ! -f /ee-backup/$EE_DOMAIN/wp-config.php ]; then
+    if [ ! -f /ee-backup/$EE_DOMAIN/wp-config.php && "$EE_SITE_CREATE_OPTION" != "--html" && "$EE_SITE_CREATE_OPTION" != "--php" && "$EE_SITE_CREATE_OPTION" != "--mysql" ]; then
       lftp -e "get -c $EE_REMOTE_PATH/../wp-config.php; quit" sftp://$EE_REMOTE_USER@$EE_REMOTE_SERVER
     fi
   fi