From 0a1965301225626d3a72ddf7d6ca4a1030a88376 Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Fri, 7 Apr 2017 21:30:59 +0200
Subject: [PATCH] okej
---
Vagrantfile | 2 +-
build.sh | 10 ++++++++--
build_as_vagrant.sh | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index eeefca6..bd986aa 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 28caaf2..be4c582 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 d2a534d..725c9cb 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
--
GitLab