Merge branch 'release/v1.5.0'

Author: clivewalkden

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.5.0] - 2020-10-14
+### Added
+- New fields for local file owner and group, and local shared directory
+- Chown is now run for all transferred files.
+- Theme files now regenerated.
+
+### Changed
+- Added check for www in domains when replacing urls
+- Updated some of the messaging to be more uniform.
+
+
 ## [1.4.1] - 2020-09-08
 ### Changed
 - Starting to unify messages.

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.1.1"
+# version="1.5.0"
 #
 # This is an optional arguments-only example of Argbash potential
 #

README.md

@@ -1,4 +1,4 @@
-# Magento 2 Production DB Sync v1.4.1
+# Magento 2 Production DB Sync v1.5.0
 
 ## About
 A script to copy over a production database to another server, also has the ability to copy across imagery.
@@ -15,7 +15,7 @@ Currently the script is configured to attempt Magento 2 and WordPress database m
 ## Installing and Updating
 To install or update the script run the following curl script
 
-```curl -o- https://raw.githubusercontent.com/clivewalkden/bash-magento2-db-sync/v1.4.1/install.sh | bash```
+```curl -o- https://raw.githubusercontent.com/clivewalkden/bash-magento2-db-sync/master/install.sh | bash```
 
 ## Usage
 To copy over a production database first get a shell on the system you want to copy the data to. 
@@ -30,12 +30,16 @@ $ db-sync.sh
 You can save a configuration file in the Magento directory to save answering some of the questions. An example is included in this repository [example.conf](./example.conf)
 
 ```bash
-remote_host=cotswoldcollections.com
-remote_domain=www.cotswoldcollections.com
+remote_host=domain.com
+remote_domain=www.domain.com
 remote_port=22
 remote_username=magento
 remote_magento_dir=/opt/magento/magento2
 remote_backup_dir=/opt/magento/backups
 remote_shared_deployment_dir=/opt/magento/deployment/shared/magento
+local_backup_dir=/opt/magento/backups
+local_shared_deployment_dir=/opt/magento/deployment/shared/magento
+local_file_user=magento
+local_file_group=magento
 ```
 

db-sync.sh

@@ -13,7 +13,7 @@ source "${dbsyncutil}menu.sh"
 
 # Make sure we are in a Magento directory
 if [ ! -f "bin/magento" ]; then
-    echo -e "${bg_red}${txt_white}                                                ${txt_end}"
+    printf '%-1s %-80s %-1s' "${bg_red}${txt_white}" " " "${txt_end}"
     echo -e "${bg_red}${txt_white}  You are not currently in a Magento directory  ${txt_end}"
     echo -e "${bg_red}${txt_white}                                                ${txt_end}"
     exit
@@ -32,12 +32,14 @@ echo -e "${txt_blue}  Checking for local configuration file (${conf_file}).  ${t
 echo -e ""
 if [[ -f "$conf_file" ]]; then
     . "$conf_file"
+    echo -e "${txt_blue}  Loaded from config.  ${txt_end}"
 fi
 
 set -e
 
 # Set ${remote_host}
 source "${dbsyncutil}set_remote_host.sh"
+source "${dbsyncutil}set_local_vars.sh"
 
 # Test Connection
 while true; do
@@ -88,11 +90,13 @@ echo -e ""
 n98-magerun setup:upgrade
 echo
 n98-magerun setup:di:compile
+echo 
+n98-magerun setup:static-content:deploy -f -j8 en_GB en_US
 echo
 n98-magerun indexer:reindex
 echo
 n98-magerun cache:flush
 
 echo -e "${bg_green}${txt_white}${txt_bold}                                             ${txt_end}"
-echo -e "${bg_green}${txt_white}${txt_bold}  Database migrated: ${txt_yellow}${domain}  ${txt_end}"
+echo -e "${bg_green}${txt_white}${txt_bold}  Database migrated: ${txt_yellow}${new_domain}  ${txt_end}"
 echo -e "${bg_green}${txt_white}${txt_bold}                                             ${txt_end}"

example.conf

@@ -6,3 +6,7 @@ remote_username=magento
 remote_magento_dir=/opt/magento/magento2
 remote_backup_dir=/opt/magento/backups
 remote_shared_deployment_dir=/opt/magento/deployment/shared/magento
+local_backup_dir=/opt/magento/backups
+local_shared_deployment_dir=/opt/magento/deployment/shared/magento
+local_file_user=magento
+local_file_group=magento

utils/local_backup.sh

@@ -6,10 +6,10 @@ if [ $_arg_local_backup == 'on' ]; then
     echo -e "${txt_blue}  Backing up local database(s).${txt_end}"
     echo -e ""
 
-    n98-magerun --ansi --root-dir="${PWD}" db:dump --compression="gzip" --force "../backups/$DATESTAMP-m2.sql.gz"
+    n98-magerun --ansi --root-dir="${PWD}" db:dump --compression="gzip" --force "${local_backup_dir}/$DATESTAMP-m2.sql.gz"
 
     if [ $_arg_wordpress == 'on' ]; then
-        n98-magerun --ansi --root-dir="${PWD}" db:dump --compression="gzip" --connection="wordpress" --force "../backups/$DATESTAMP-wp.sql.gz"
+        n98-magerun --ansi --root-dir="${PWD}" db:dump --compression="gzip" --connection="wordpress" --force "${local_backup_dir}/$DATESTAMP-wp.sql.gz"
     fi
 else
     # No local backup

utils/local_imagery_import.sh

@@ -7,8 +7,9 @@ echo -e ""
 
 # Set the default directories to transfer
 source=("/pub/media/" "/wp/wp-content/uploads/")
-dest=("./pub/media/" "./wp/wp-content/uploads/")
+dest=("${local_shared_deployment_dir}/pub/media/" "${local_shared_deployment_dir}/wp/wp-content/uploads/")
 
 for i in "${!source[@]}"; do
-    rsync -rlDhP --exclude 'cache*' -e "ssh -p${remote_port}" "$remote_username@$remote_host:$remote_shared_deployment_dir${source[$i]}" "${dest[$i]}"
+    rsync --recursive --links --human-readable --partial --progress --compress --perms --exclude 'cache*' -e "ssh -p${remote_port}" "$remote_username@$remote_host:$remote_shared_deployment_dir${source[$i]}" "${dest[$i]}"
+    sudo chown -R $local_file_user:$local_file_group "${dest[$i]}"
 done

utils/local_import.sh

@@ -5,8 +5,8 @@ echo -e ""
 echo -e "${txt_blue}  Importing into local database(s).${txt_end}"
 echo -e ""
 
-mysql -h$DB_HOST -u$DB_USER -p$DB_PASS $DB_DBASE<../backups/latest-m2.sql
+mysql -h$DB_HOST -u$DB_USER -p$DB_PASS $DB_DBASE<$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<../backups/latest-wp.sql
+    mysql -h$DB_WP_HOST -u$DB_WP_USER -p$DB_WP_PASS $DB_WP_DBASE<$local_backup_dir/latest-wp.sql
 fi

utils/menu.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-version="1.4.1"
+version="1.5.0"
 
 die()
 {
@@ -39,7 +39,7 @@ dbsync_print_help() {
   Options:
     -b, --local-backup: perform a backup before importing remote (off by default)
     -f, --full: full database dump (off by default)
-	-w, --wordpress: include wordpress content (off by default)"
+    -w, --wordpress: include wordpress content (off by default)"
     -v, --version: Prints version
     -h, --help: Prints help
 

utils/remote_retrieve.sh

@@ -8,12 +8,21 @@ echo -e ""
 remote_m2_db_file="$remote_backup_dir/latest-m2.sql.gz"
 remote_wp_db_file="$remote_backup_dir/latest-wp.sql.gz"
 
-mkdir -p ../backups
+while [[ -z ${local_backup_dir} ]]; do
+    # prompt and set ${local_backup_dir}
+    read -p $'\e[1mLocal host backup directory\e[0m: ' -r -e local_backup_dir
 
-scp -C -P "${remote_port}" "${remote_username}@${remote_host}:$remote_m2_db_file" ../backups/latest-m2.sql.gz
-gunzip -f ../backups/latest-m2.sql.gz
+    if [[ -z ${local_backup_dir} ]]; then
+        echo -e "${txt_red}Local host backup directory is required${txt_end}"
+    fi
+done
+
+mkdir -p "${local_backup_dir}"
+
+scp -C -P "${remote_port}" "${remote_username}@${remote_host}:${remote_m2_db_file}" "${local_backup_dir}/latest-m2.sql.gz"
+gunzip -f "${local_backup_dir}/latest-m2.sql.gz"
 
 if [ $_arg_wordpress == 'on' ]; then
-    scp -C -P "${remote_port}" "${remote_username}@${remote_host}:$remote_backup_dir/latest-wp.sql.gz" ../backups/latest-wp.sql.gz
-    gunzip -f ../backups/latest-wp.sql.gz
+    scp -C -P "${remote_port}" "${remote_username}@${remote_host}:${remote_backup_dir}/latest-wp.sql.gz" "${local_backup_dir}/latest-wp.sql.gz"
+    gunzip -f "${local_backup_dir}/latest-wp.sql.gz"
 fi