From 08db3438a763bb19698124739248c6659f470949 Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Fri, 7 Apr 2017 15:22:46 +0200
Subject: [PATCH] fu mono

---
 build.sh            | 14 ++------------
 build_as_vagrant.sh |  3 +++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/build.sh b/build.sh
index 5bd8c40..44f1460 100644
--- a/build.sh
+++ b/build.sh
@@ -19,18 +19,8 @@ echo "deb http://download.mono-project.com/repo/ubuntu precise main" | sudo tee
 ## update
 apt-get update
 
-# Install things
-TO_INSTALL=""
-## Mono for .NET 4.0, and winbind for ntlm_auth
-TO_INSTALL="$TO_INSTALL mono-complete winbind"
-## WINE
-TO_INSTALL="$TO_INSTALL wine winetricks xvfb"
-## Fonts for Mono/WINE
-TO_INSTALL="$TO_INSTALL xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic"
-## Things
-TO_INSTALL="$TO_INSTALL unzip curl"
-## roll - globbing intended
-apt-get install -y $TO_INSTALL
+# Install WINE things
+apt-get install -y wine winetricks xvfb xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic unzip curl
 
 # Install command
 cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build
diff --git a/build_as_vagrant.sh b/build_as_vagrant.sh
index 4b80a26..8ae230b 100644
--- a/build_as_vagrant.sh
+++ b/build_as_vagrant.sh
@@ -15,6 +15,9 @@ export DISPLAY=:0.0
 wine start.exe
 ln -s /vagrant /home/vagrant/.wine/drive_c/vagrant
 
+# Only now is it safe to install Mono
+sudo apt-get install winbind mono-complete
+
 # Install Tibbo tools
 mkdir -p "/home/vagrant/.wine/drive_c/Program Files/Tibbo"
 wget http://dev.dms-serwis.com.pl/misc/tide-tibbo-lite-5.1.3-win32.zip -O /tmp/tibbo.zip
-- 
GitLab