Updated version number to make sure we see the changes on the test system.

Updated rsync flags passed.
Removing www from new url before replacement.
Updated readme to use master branch for installation.

Author: clivewalkden

README.md

@@ -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. 

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

utils/local_imagery_import.sh

@@ -10,6 +10,6 @@ source=("/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]}"
-    chown -R $local_file_user:$local_file_group "${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/menu.sh

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

utils/url_update.sh

@@ -16,6 +16,8 @@ new_domain=$(printf '%s' "${new_domain}" | sed 's/^https:\/\///g')
 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:/*$::')
 
@@ -31,13 +33,13 @@ old_domain=$(printf '%s' "${old_domain}" | sed 's/^\/\///g')
 # trim multiple and trailing slashes
 old_domain=$(echo ${old_domain} | sed 's:/*$::')
 
-echo -e "${txt_blue}  Old Domain: ${old_domain} to New Domain: ${new_domain}.${txt_end}"
+echo -e "${txt_blue}  Old Domain: (www.)${old_domain} to New Domain: ${new_domain}.${txt_end}"
 echo -e ""
 
-sed -i "s|$old_domain|$new_domain|g" "${local_backup_dir}/latest-m2.sql"
 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|$old_domain|$new_domain|g" "${local_backup_dir}/latest-wp.sql"
     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