Merge pull request #254 from lemberg/issue/mkcert-file-provisioner-do…

…esnt-run-on-vagrant-up

Improve detection whether VM is supposed to be provisioned or not

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Draft Environment (Unreleased)
 
+- [GH-232](https://github.com/lemberg/draft-environment/pull/254) - Improve detection whether VM is supposed to be provisioned or not (fixes mkcert certificate not being installed on `vagrant up`)
 - [GH-232](https://github.com/lemberg/draft-environment/pull/232) - Improve new dependencies autoloading
 - [GH-220](https://github.com/lemberg/draft-environment/pull/220) - Store last applied update in the vm-settings.yml file instead of composer.lock
 - [GH-245](https://github.com/lemberg/draft-environment/pull/245) - Fix MySQL fail to install due to incorrect configuration of the SQL mode ('~' is not a valid configuration)

provisioning/src/configuration.rb

@@ -73,6 +73,9 @@ def set_value_by_path(hash, path, value)
   # Returns nothing.
   protected
   def load_settings(project_base_path, draft_base_path)
+    @project_base_path = project_base_path
+    @draft_base_path = draft_base_path
+
     default_settings = YAML::load_file("#{draft_base_path}/default.vm-settings.yml")
     if File.exist?("#{project_base_path}/vm-settings.yml")
       settings = YAML::load_file("#{project_base_path}/vm-settings.yml")
@@ -247,9 +250,9 @@ def is_provisioning
       return true
     end
 
-    if (ARGV.include?("up"))
-      status = `vagrant status`
-      return status.include? "not created"
+    # Pretty hacky way of checking whether machine has been provisioned or not.
+    if (ARGV.include?("up") || ARGV.include?("reload"))
+      return !File.exist?("#{@project_base_path}/.vagrant/machines/#{self.get('virtualbox.name')}/virtualbox/action_provision")
     end
 
     return false