diff --git a/Vagrantfile b/Vagrantfile index eeefca667e09368d6e7710bf778a14fbb56ce5aa..bd986aa9f47c80d3f0bbdea4bc36a53cee1c945b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,6 @@ Vagrant.configure("2") do |config| - config.vm.box = "hashicorp/precise32" + config.vm.box = "ubuntu/trusty32" config.vm.provision "shell", inline: <<-SHELL diff --git a/build.sh b/build.sh index 28caaf2d172cda0c3bc634a9df1654f68fe6947b..be4c582c6ed6f1dd9a3b24ebb7f22d8e9c553497 100644 --- a/build.sh +++ b/build.sh @@ -12,20 +12,26 @@ apt-get install -y python-software-properties # Repositories ## Mono apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb http://download.mono-project.com/repo/ubuntu precise main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list +echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list apt-get update # Install fontconfig, wait for processing -apt-get install -y fontconfig xorg dbus-x11 xvfb x-ttcidfont-conf unzip +apt-get install -y fontconfig xorg dbus-x11 xvfb unzip while [ ! -f /etc/fonts/fonts.conf ] ; do sleep 1 done +#safe +# x-ttcidfont-conf + +# Accept EULA +echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections # Install WINE things apt-get install -y wine winetricks + # Install command cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build chmod ugo+rx /usr/sbin/tibbo_build diff --git a/build_as_vagrant.sh b/build_as_vagrant.sh index d2a534d9d9437421d352c3f1d3c0efffd25b2bdb..725c9cb727071d47be2c7c942fbdbf61f09412a9 100644 --- a/build_as_vagrant.sh +++ b/build_as_vagrant.sh @@ -10,7 +10,7 @@ export FONTCONFIG_PATH="/etc/fonts" cd /home/vagrant # Set up framebuffer -sudo Xvfb :0 -screen 0 1024x768x16 & +Xvfb :0 -screen 0 1024x768x16 & # Prepare WINE folder hierarchy wine start.exe