Skip to content
This repository has been archived by the owner on Aug 20, 2019. It is now read-only.

Commit

Permalink
Added support for COMPOSER_VENDOR_DIR. (#422)
Browse files Browse the repository at this point in the history
  • Loading branch information
thom8 authored Jun 21, 2017
1 parent 5e6f5d1 commit fa15a99
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_dir = ENV['BEET_CONFIG_DIR'] || "#{beet_root}/.beetbox"
project_config = "#{config_dir}/config.yml"
local_config = "#{config_dir}/local.config.yml"
composer_conf = JSON.parse(ENV['COMPOSER'] || File.read("#{beet_root}/composer.json"))
vendor_dir = composer_conf['config']['vendor-dir'] || 'vendor'
vendor_dir = ENV['COMPOSER_VENDOR_DIR'] ||= composer_conf['config']['vendor-dir'] ||= 'vendor'
default_config = "#{vendor_dir}/beet/box/provisioning/ansible/config/default.config.yml"
default_config = "provisioning/ansible/config/default.config.yml" if !File.exist?(default_config)

Expand Down

0 comments on commit fa15a99

Please sign in to comment.