Merge branch 'dev'

Author: mikeschinkel

.gitignore

@@ -1,6 +1,18 @@
-.idea
-
+/.idea
 /sql/*
 !/sql/default.sql
-IP
-.vagrant
+/IP
+/.vagrant
+/.vscode
+/.wplib-box.git
+/.save.git
+/logs
+/scripts
+/www/*
+!/www/content/
+!/www/content/object-cache.php
+/www/content/mu-plugins/wp-redis
+/www/content/plugins/helpful-information
+/www/content/plugins/query-monitor
+/www/content/themes/twentysixteen
+/watchers

Vagrantfile

@@ -268,10 +268,20 @@ Vagrant.configure(2) do |config|
     config.ssh.forward_agent = true
     config.ssh.insert_key = false
 
-    config.vm.provision "shell", path: "scripts/guest/provision.sh"
+    $provision = <<PROVISION
+if [ -f "/vagrant/scripts/provision.sh" ]; then
+    bash /vagrant/scripts/provision.sh --force
+else
+    rm -rf /tmp/box-scripts  2>/dev/null
+    git clone https://github.com/wplib/box-scripts.git /tmp/box-scripts  2>/dev/null
+    bash /tmp/box-scripts/provision.sh
+fi
+PROVISION
+
+    config.vm.provision "shell", inline: $provision
 
     config.trigger.before :halt do
-        run_remote "mkdir -p /vagrant/sql && mysqldump -u wordpress -pwordpress wordpress > /vagrant/sql/current.sql"
+        run_remote "box backup-db"
     end
 
 end

WPLIB_BOX_GIT_REPO

@@ -1,3 +1,17 @@
 <?php
-define( 'WP_USE_THEMES', true );
-require( __DIR__ . '/wp/wp-blog-header.php' );
+/**
+ * Front to the WordPress application. This file doesn't do anything, but loads
+ * wp-blog-header.php which does and tells WordPress to load the theme.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Tells WordPress to load the WordPress theme and output it.
+ *
+ * @var bool
+ */
+define('WP_USE_THEMES', true);
+
+/** Loads the WordPress Environment and Template */
+require( dirname( __FILE__ ) . '/wp/wp-blog-header.php' );