Merge branch 'release/v1.7.1'

Author: clivewalkden

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.1] - 2021-07-30
+### Changed
+- Database dump no includes the --no-tablespaces option to stop PROCESS provilege error. (Requires n98-magerun >4.3.0).
+- WordPress backup now runs search-replace on remote host export.
+- Magento database import now uses n98-magerun to import database.
+- WordPress import now uses wp-cli to import database.
+- Tidy up of unneeded variables.
+
+
 ## [1.7.0] - 2021-04-27
 ### Added
 - New flag to add prefix to sales orders, invoices, credit memos and shipments.

MENU.md

@@ -4,7 +4,7 @@ Use the below to generate the menu.sh file from the site [https://argbash.io/gen
 
 ```
 #!/bin/bash
-# version="1.7.0"
+# version="1.7.1"
 #
 # This is an optional arguments-only example of Argbash potential
 #

README.md

@@ -1,4 +1,4 @@
-# Magento 2 Production DB Sync v1.7.0
+# Magento 2 Production DB Sync v1.7.1
 
 ## About
 A script to copy over a production database to another server, also has the ability to copy across imagery.
@@ -8,6 +8,7 @@ Currently the script is configured to attempt Magento 2 and WordPress database m
 ## Requirements
 - You need curl installed locally. 
 - The excellent [n98-magerun2](https://github.com/netz98/n98-magerun2) needs to be installed on both the local machine and the production machine. (Needs to be executable as n98-magerun).
+- WP-CLI needs to be installed when working with WordPress as well.
 - MySQL (or equivalent) needs to be installed on both the local machine and the server (obviously).
 - Magento 2 needs to be installed and configured on both the local and the host machine.
 - rsync needs to be installed locally.

install.sh

@@ -7,7 +7,7 @@
   }
 
   dbsync_latest_version() {
-    echo "v1.7.0"
+    echo "v1.7.1"
   }
 
   #

utils/local_import.sh

@@ -5,8 +5,11 @@ echo
 echo -e "${txt_blue}  Importing into local database(s).${txt_end}"
 echo
 
-mysql -h$DB_HOST -u$DB_USER -p$DB_PASS $DB_DBASE<$local_backup_dir/latest-m2.sql
+n98-magerun db:import --drop-tables $local_backup_dir/latest-m2.sql
 
 if [ $_arg_wordpress == 'on' ]; then
-    mysql -h$DB_WP_HOST -u$DB_WP_USER -p$DB_WP_PASS $DB_WP_DBASE<$local_backup_dir/latest-wp.sql
+    cd wp
+    sed -i '1s/^/SET SQL_MODE='\''ALLOW_INVALID_DATES'\'';\n\n/' $local_backup_dir/latest-wp.sql
+    
+    wp db import $local_backup_dir/latest-wp.sql
 fi

utils/menu.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-version="1.7.0"
+version="1.7.1"
 
 die()
 {

utils/remote_backup.sh

@@ -9,22 +9,53 @@ if [ $_arg_full == 'on' ]; then
 fi
 printf "${bg_black}${txt_white}%-80s${txt_end}\n" " "
 
+# Get the URL from n98, if the first option fails it'll try the next
+if ! CURRENT_URL=$(n98-magerun config:env:show system.default.web.secure.base_url); then
+    CURRENT_URL=$(n98-magerun config:show web/secure/base_url)
+fi
+
+new_domain=${CURRENT_URL,,}
+# remove http://
+new_domain=$(printf '%s' "${new_domain}" | sed 's/^http:\/\///g')
+# remove https://
+new_domain=$(printf '%s' "${new_domain}" | sed 's/^https:\/\///g')
+# remove ://
+new_domain=$(printf '%s' "${new_domain}" | sed 's/^:\/\///g')
+# remove //
+new_domain=$(printf '%s' "${new_domain}" | sed 's/^\/\///g')
+# remove www.
+new_domain=$(printf '%s' "${new_domain}" | sed 's/^www\.//g')
+# trim multiple and trailing slashes
+new_domain=$(echo ${new_domain} | sed 's:/*$::')
+
+old_domain=${remote_domain,,}
+# remove http://
+old_domain=$(printf '%s' "${old_domain}" | sed 's/^http:\/\///g')
+# remove https://
+old_domain=$(printf '%s' "${old_domain}" | sed 's/^https:\/\///g')
+# remove ://
+old_domain=$(printf '%s' "${old_domain}" | sed 's/^:\/\///g')
+# remove //
+old_domain=$(printf '%s' "${old_domain}" | sed 's/^\/\///g')
+
+# replace . with \.
+old_domain="${old_domain//./\.}" 
+
+# trim multiple and trailing slashes
+old_domain=$(echo ${old_domain} | sed 's:/*$::')
+
 ssh -p "${remote_port}" "${remote_username}@${remote_host}" <<ENDSSH
 mkdir -p $remote_backup_dir
 cd $remote_magento_dir
 
-REMOTE_DB_WP_HOST=$(n98-magerun config:env:show db.connection.wordpress.host)
-REMOTE_DB_WP_USER=$(n98-magerun config:env:show db.connection.wordpress.username)
-REMOTE_DB_WP_PASS=$(n98-magerun config:env:show db.connection.wordpress.password)
-REMOTE_DB_WP_DBASE=$(n98-magerun config:env:show db.connection.wordpress.dbname)
-
 if [ $_arg_full == 'on' ]; then
-n98-magerun --quiet --no-interaction db:dump --compression="gzip" --strip="@log @sessions" --force $remote_backup_dir/latest-m2.sql.gz
+n98-magerun --quiet --no-interaction db:dump --no-tablespaces --compression="gzip" --strip="@log @sessions" --force $remote_backup_dir/latest-m2.sql.gz
 else
-n98-magerun --quiet --no-interaction db:dump --compression="gzip" --strip="@log @sessions @trade @sales $ignore_tables" --force $remote_backup_dir/latest-m2.sql.gz
+n98-magerun --quiet --no-interaction db:dump --no-tablespaces --compression="gzip" --strip="@log @sessions @trade @sales $ignore_tables" --force $remote_backup_dir/latest-m2.sql.gz
 fi
 
 if [ $_arg_wordpress == 'on' ]; then
-n98-magerun --quiet --no-interaction db:dump --compression="gzip" --connection="wordpress" --force $remote_backup_dir/latest-wp.sql.gz
+cd wp
+wp search-replace 'http[s]?:\/\/(?:www\.)?$old_domain' 'https://$new_domain' --regex --export | gzip > $remote_backup_dir/latest-wp.sql.gz
 fi
 ENDSSH

utils/url_update.sh

@@ -41,8 +41,3 @@ echo -e ""
 
 sed -i "s|www.$old_domain|$new_domain|g" "${local_backup_dir}/latest-m2.sql"
 sed -i "s|$old_domain|$new_domain|g" "${local_backup_dir}/latest-m2.sql"
-
-if [ $_arg_wordpress == 'on' ]; then
-    sed -i "s|www.$old_domain|$new_domain|g" "${local_backup_dir}/latest-wp.sql"
-    sed -i "s|$old_domain|$new_domain|g" "${local_backup_dir}/latest-wp.sql"
-fi