Skip to content
This repository was archived by the owner on Oct 1, 2020. It is now read-only.

Commit d5d565c

Browse files
author
Alex Paliarush
committed
Merge remote-tracking branch 'remotes/origin/2.0' into Magento-Upgrade
2 parents 167bba2 + 1691fab commit d5d565c

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true

init_project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ fi
198198
status "Initializing vagrant box"
199199
cd "${vagrant_dir}"
200200

201-
vagrant up 2> >(logError) | {
201+
vagrant up --provider virtualbox 2> >(logError) | {
202202
while IFS= read -r line
203203
do
204204
filterVagrantOutput "${line}"

scripts/host/check_mounted_directories.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ source "${vagrant_dir}/scripts/output_functions.sh"
77
cd "${vagrant_dir}"
88
if [[ ! -f "${vagrant_dir}/etc/guest/mysql/my.cnf" ]]; then
99
error "Directory '${vagrant_dir}/etc' was not mounted as expected by Vagrant.
10-
Please make sure that Vagrant is able to mount VirtualBox shared folders on your environment (see https://www.vagrantup.com/docs/synced-folders/basic_usage.html )"
10+
Please make sure that 'paliarush/magento2.ubuntu' Vagrant box was downloaded successfully (if not, this may help http://stackoverflow.com/questions/35519389/vagrant-cannot-find-box)
11+
And that Vagrant is able to mount VirtualBox shared folders on your environment (see https://www.vagrantup.com/docs/synced-folders/basic_usage.html )"
1112
exit 1
1213
fi
1314
vagrant ssh -c "bash /vagrant/scripts/guest/check_mounted_directories" 2> >(logError)

0 commit comments

Comments
 (0)