Disable plugins on plugin commands but allow init when listing
This commit is contained in:
parent
addc7576cc
commit
1bba1f86bb
11
bin/vagrant
11
bin/vagrant
|
@ -37,13 +37,18 @@ argv.each_index do |i|
|
||||||
arg = argv[i]
|
arg = argv[i]
|
||||||
|
|
||||||
if !arg.start_with?("-")
|
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] = ""
|
opts[:vagrantfile_name] = ""
|
||||||
ENV['VAGRANT_NO_PLUGINS'] = "1"
|
ENV['VAGRANT_NO_PLUGINS'] = "1"
|
||||||
end
|
end
|
||||||
|
|
||||||
if arg == "plugin" && argv[i+1] != "list"
|
# Do not load plugins when performing plugin operations
|
||||||
ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = "1"
|
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
|
end
|
||||||
|
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in New Issue