Merge branch 'develop' into Mte90/2051

Author: tomjn

CHANGELOG.md

@@ -17,6 +17,7 @@ permalink: /docs/en-US/changelog/
 * Major refactor of the main provisioner, and introduction of a hook system to be used while provisioning ( #2230, #2238 )
 * Support for cloning git repositories into sites via `config.yml` ( #2247 )
 * Install WP-CLI doctor package ( #2051 )
+* Enhanced database backup terminal output ( #2256 ) 
 
 ### Deprecations
 

config/homebin/db_backup

@@ -3,19 +3,29 @@
 # Create individual SQL files for each database. These files
 # are imported automatically during an initial provision if
 # the databases exist per the import-sql.sh process.
+trap 'rm -rf $TMPFIFODIR' EXIT; TMPFIFODIR=$(mktemp -d); mkfifo $TMPFIFODIR/dbnames
+
 mkdir -p /srv/database/backups
 echo " * Performing Database Backups"
+databases=()
+
 mysql --user="root" --password="root" -e 'show databases' | \
-grep -v -F "Database" | \
-while read db_name;
+grep -v -F "Database" > dbnames &
+while read db_name
 do
     # skip these databases
-    [ "${db_name}" == "mysql" ] && continue;
-    [ "${db_name}" == "information_schema" ] && continue;
-    [ "${db_name}" == "performance_schema" ] && continue;
-    [ "${db_name}" == "test" ] && continue;
+    [ "${db_name}" == "mysql" ] && echo "   - skipped ${db_name}" && continue;
+    [ "${db_name}" == "information_schema" ] && echo "   - skipped ${db_name}" && continue;
+    [ "${db_name}" == "performance_schema" ] && echo "   - skipped ${db_name}" && continue;
+    [ "${db_name}" == "test" ] && echo "   - skipped ${db_name}" && continue;
+    databases+=( "${db_name}" )
+done < dbnames
 
-    echo "   - Backing up \"${db_name}\" to database/backups/${db_name}.sql"
-    mysqldump -uroot -proot "${db_name}" > "/srv/database/backups/${db_name}.sql";
+count=0
+for db in "${databases[@]}"
+do
+    printf "   - %2s/%s Backing up %-23s to 'database/backups/%s.sql'\n" "${count}" "${#databases[@]}" "'${db}'" "${db}"
+    mysqldump -uroot -proot "${db}" > "/srv/database/backups/${db}.sql";
+    let "count=count+1"
 done
 echo " * Finished backing up databases to the database/sql/backups folder"

provision/core/php/provision.sh

@@ -27,6 +27,7 @@ function php_register_packages() {
 
     # Extra PHP modules that we find useful
     php-pear
+    php-pcov
     php-ssh2
     php-yaml
     "php${VVV_BASE_PHPVERSION}-bcmath"
@@ -44,13 +45,13 @@ function php_register_packages() {
 
   # ImageMagick
   VVV_PACKAGE_LIST+=(
-    php-imagick
+    php${VVV_BASE_PHPVERSION}-imagick
     imagemagick
   )
 
   # XDebug
   VVV_PACKAGE_LIST+=(
-    php-xdebug
+    php${VVV_BASE_PHPVERSION}-xdebug
 
     # Required for Webgrind
     graphviz
@@ -103,6 +104,7 @@ function phpfpm_finalize() {
   # Disable PHP Xdebug module by default
   echo " * Disabling XDebug PHP extension"
   phpdismod xdebug
+  phpdismod pcov
 
   # Add the vagrant user to the www-data group so that it has better access
   # to PHP and Nginx related files.
@@ -131,8 +133,8 @@ vvv_add_hook nginx_upstreams php_nginx_upstream
 function memcached_register_packages() {
   # MemCached
   VVV_PACKAGE_LIST+=(
-    php-memcache
-    php-memcached
+    php${VVV_BASE_PHPVERSION}-memcache
+    php${VVV_BASE_PHPVERSION}-memcached
 
     # memcached is made available for object caching
     memcached