From 9425a3820b2643f40a061e809f211999915f8f14 Mon Sep 17 00:00:00 2001 From: byte Date: Sat, 16 Feb 2019 21:11:59 -0500 Subject: [PATCH] tweaks --- Vagrantfile | 6 +++++- vagrant/install.sh | 4 ++-- vagrant/ruby-setup.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 524632cfa..bba036944 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,7 +18,11 @@ Vagrant.configure('2') do |config| node.vm.network :private_network, ip: '192.168.64.78' end - config.vm.synced_folder '.', '/vagrant' + if Vagrant::Util::Platform.windows? + config.vm.synced_folder '.', '/vagrant', type: 'virtualbox' + else + config.vm.synced_folder '.', '/vagrant', type: 'nfs' + end config.vm.provision 'shell', path: 'vagrant/install.sh' end diff --git a/vagrant/install.sh b/vagrant/install.sh index 46ca2a8b3..471e35207 100644 --- a/vagrant/install.sh +++ b/vagrant/install.sh @@ -66,8 +66,8 @@ sudo apt-get update if ! install_packages \ build-essential automake libxml2-dev libxslt-dev yarn nginx ncurses-dev \ libreadline-dev flex bison ragel memcached libmemcached-dev git curl \ - libcurl4-openssl-dev sendmail-bin sendmail nginx ssh ffmpeg \ - mkvtoolnix cmake ffmpeg git postgresql-11 libcurl4-openssl-dev \ + libcurl4-openssl-dev sendmail-bin sendmail nginx ssh libglib2.0-dev \ + mkvtoolnix cmake ffmpeg git postgresql-11 libcurl4-openssl-dev ffmpeg \ libicu-dev libjpeg-progs libpq-dev libreadline-dev libxml2-dev \ nodejs optipng redis-server libvips-tools postgresql-server-dev-11; then >&2 script_log "Installation of other dependencies failed, please see the errors above and re-run \`vagrant provision\`" diff --git a/vagrant/ruby-setup.sh b/vagrant/ruby-setup.sh index bf3d246b3..76fc64e2c 100755 --- a/vagrant/ruby-setup.sh +++ b/vagrant/ruby-setup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -script_log(){ +script_log() { echo -e "[setup.sh] >>> $@" }