From 1bba1f86bbec387a9297ffd0b705783805b959df Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 8 May 2018 13:46:44 -0700 Subject: [PATCH] Disable plugins on plugin commands but allow init when listing --- bin/vagrant | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/vagrant b/bin/vagrant index bac678f11..7720d0915 100755 --- a/bin/vagrant +++ b/bin/vagrant @@ -37,13 +37,18 @@ argv.each_index do |i| arg = argv[i] if !arg.start_with?("-") - if ["plugin", "help"].include?(arg) || (arg == "box" && argv[i+1] == "list") + if arg == "box" && argv[i+1] == "list" opts[:vagrantfile_name] = "" ENV['VAGRANT_NO_PLUGINS'] = "1" end - if arg == "plugin" && argv[i+1] != "list" - ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = "1" + # Do not load plugins when performing plugin operations + if arg == "plugin" + ENV['VAGRANT_NO_PLUGINS'] = "1" + # Only initialize plugins when listing installed plugins + if argv[i+1] != "list" + ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = "1" + end end break