diff --git a/Vagrantfile b/Vagrantfile index bd986aa9f47c80d3f0bbdea4bc36a53cee1c945b..1887afb2844dcfbe730106c3262f9b14e39501e6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,7 +4,39 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL - bash /vagrant/build.sh + export DISPLAY=:0.0 + export WINEPREFIX="/home/vagrant/.wine" + export WINEARCH="win32" + export FONTCONFIG_PATH="/etc/fonts" + + apt-get update + apt-get install -y python-software-properties fontconfig xorg dbus-x11 xvfb unzip + # Accept EULA + echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections + + # Repositories + ## Mono + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF + echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list + + wget https://dl.winehq.org/wine-builds/Release.key + apt-key add Release.key + apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/ + + apt-get update + + # Install fontconfig, wait for processing + + apt-get install -y --install-recommends winehq-stable + + # Install command + cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build + chmod ugo+rx /usr/sbin/tibbo_build + + # Sanitize + chown -R vagrant:vagrant /home/vagrant + + # the Vagrant part su vagrant -c 'bash /vagrant/build_as_vagrant.sh' # Minify diff --git a/build.sh b/build.sh deleted file mode 100644 index 2731b76e417d985ca9eb814fa96ac24b7081008a..0000000000000000000000000000000000000000 --- a/build.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -set -e - -export DISPLAY=:0.0 -export WINEPREFIX="/home/vagrant/.wine" -export WINEARCH="win32" -export FONTCONFIG_PATH="/etc/fonts" - -apt-get update -apt-get install -y python-software-properties -# Accept EULA -echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections -# Repositories -## Mono -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list - -wget https://dl.winehq.org/wine-builds/Release.key -apt-key add Release.key -apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/ - -apt-get update - -# Install fontconfig, wait for processing -apt-get install -y fontconfig xorg dbus-x11 xvfb unzip -while [ ! -f /etc/fonts/fonts.conf ] ; -do - sleep 1 -done -#safe -apt-get install --install-recommends winehq-stable -# x-ttcidfont-conf - - - -# 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 - -# Sanitize -chown -R vagrant:vagrant /home/vagrant