Merge branch 'release/v1.4.1'

Author: clivewalkden

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.1] - 2020-09-08
+### Changed
+- Starting to unify messages.
+
+### Fixed
+- URL switch for WordPress database.
+
+
 ## [1.4.0] - 2020-09-02
 ### Added
 - wordpress flag (disabled by default) to backup wordpress database and imagery.

README.md

@@ -1,4 +1,4 @@
-# Magento 2 Production DB Sync v1.4.0
+# Magento 2 Production DB Sync v1.4.1
 
 ## 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.0/install.sh | bash```
+```curl -o- https://raw.githubusercontent.com/clivewalkden/bash-magento2-db-sync/v1.4.1/install.sh | bash```
 
 ## Usage
 To copy over a production database first get a shell on the system you want to copy the data to. 

db-sync.sh

@@ -27,7 +27,9 @@ echo -e "${bg_black}${txt_white}  Copy over a production database to staging  ${
 echo -e "${bg_black}${txt_white}                                              ${txt_end}"
 
 # Check for a local config file
+echo -e ""
 echo -e "${txt_blue}  Checking for local configuration file (${conf_file}).  ${txt_end}"
+echo -e ""
 if [[ -f "$conf_file" ]]; then
     . "$conf_file"
 fi
@@ -79,14 +81,12 @@ while true; do
   esac
 done
 
-echo -e "${bg_black}${txt_white}                                  ${txt_end}"
-echo -e "${bg_black}${txt_white}  Run the Magento configuration.  ${txt_end}"
-echo -e "${bg_black}${txt_white}                                  ${txt_end}"
+echo -e ""
+echo -e "${txt_blue}  Run the Magento configuration.  ${txt_end}"
+echo -e ""
 
 n98-magerun setup:upgrade
 echo
-n98-magerun deploy:mode:set developer
-echo
 n98-magerun setup:di:compile
 echo
 n98-magerun indexer:reindex

install.sh

@@ -7,7 +7,7 @@
   }
 
   dbsync_latest_version() {
-    echo "v1.4.0"
+    echo "v1.4.1"
   }
 
   #

utils/local_backup.sh

@@ -2,14 +2,18 @@
 
 if [ $_arg_local_backup == 'on' ]; then
     # Backup the current local database
-    echo -e "\n${txt_white}${bg_black}Backing up local database(s).${txt_end}\n"
+    echo -e ""
+    echo -e "${txt_blue}  Backing up local database(s).${txt_end}"
+    echo -e ""
 
-    n98-magerun --root-dir="${PWD}" db:dump --compression="gzip" --force "../backups/$DATESTAMP-m2.sql.gz"
+    n98-magerun --ansi --root-dir="${PWD}" db:dump --compression="gzip" --force "../backups/$DATESTAMP-m2.sql.gz"
 
     if [ $_arg_wordpress == 'on' ]; then
-        n98-magerun --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 "../backups/$DATESTAMP-wp.sql.gz"
     fi
 else
     # No local backup
-    echo -e "\n${txt_white}${bg_black}Skipping local database(s) backup.${txt_end}\n"
+    echo -e ""
+    echo -e "${txt_blue}  Skipping local database(s) backup.${txt_end}"
+    echo -e ""
 fi

utils/local_imagery_import.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 # Backup the current local database
-echo -e "\n${txt_white}${bg_black}Importing imagery from live.${txt_end}\n"
+echo -e ""
+echo -e "${txt_blue}  Importing imagery from live.${txt_end}"
+echo -e ""
 
 # Set the default directories to transfer
 source=("/pub/media/" "/wp/wp-content/uploads/")

utils/local_import.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 # Backup the current local database
-echo -e "\n${txt_white}${bg_black}Importing into local database(s).${txt_end}\n"
+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
 

utils/menu.sh

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

utils/remote_backup.sh

@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
 # Use the settings to check your connection
-echo -e "\n${txt_white}${bg_black}Backing up remote database(s).   ${txt_end}\n"
+echo -e "${bg_black}${txt_white}                                   ${txt_end}"
+echo -e "${bg_black}${txt_white}  Backing up remote database(s).   ${txt_end}"
 if [ $_arg_full == 'on' ]; then
-    echo -e "${txt_white}${bg_black}  Full customer and order backup.${txt_end}\n"
+    echo -e "${bg_black}${txt_white}  Full customer and order backup.  ${txt_end}"
 fi
+echo -e "${bg_black}${txt_white}                                   ${txt_end}"
 
 ssh -p "${remote_port}" "${remote_username}@${remote_host}" <<ENDSSH
 mkdir -p $remote_backup_dir
@@ -22,6 +24,6 @@ n98-magerun db:dump --compression="gzip" --strip="@log @sessions @trade @sales"
 fi
 
 if [ $_arg_wordpress == 'on' ]; then
-n98-magerun db:dump --compression="gzip" --conneciton="wordpress" --force $remote_backup_dir/latest-wp.sql.gz
+n98-magerun db:dump --compression="gzip" --connection="wordpress" --force $remote_backup_dir/latest-wp.sql.gz
 fi
 ENDSSH

utils/remote_retrieve.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 # Use the settings to check your connection
-echo -e "\n${txt_white}${bg_black}Retrieving database(s).${txt_end}\n"
+echo -e ""
+echo -e "${txt_blue}  Retrieving database(s).${txt_end}"
+echo -e ""
 
 remote_m2_db_file="$remote_backup_dir/latest-m2.sql.gz"
 remote_wp_db_file="$remote_backup_dir/latest-wp.sql.gz"