From e43c3a05d97a60700b53dc3d6b5919d375514082 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Wed, 10 Jul 2024 16:35:13 +0100 Subject: [PATCH] Improve docker/parallels detection --- Vagrantfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6b405c9e4..8c554b4dc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -42,17 +42,13 @@ end def vvv_is_docker_present() - VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version") - return true -rescue Vagrant::Errors::CommandUnavailable - return false + if system("docker version") + return true + end end def vvv_is_parallels_present() - VagrantPlugins::DockerProvider::Driver.new.execute("prctl", "version") - return true -rescue Vagrant::Errors::CommandUnavailable - return false + return Vagrant.has_plugin?("vagrant-parallels") end vagrant_dir = __dir__