From 44576bf137d459395d70921871eb8de302858c8b Mon Sep 17 00:00:00 2001 From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl> Date: Fri, 7 Apr 2017 04:52:37 +0200 Subject: [PATCH] dat linesep --- run.sh | 4 ++-- wine-tibbo/build.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/run.sh b/run.sh index 48f842f..b2373a0 100644 --- a/run.sh +++ b/run.sh @@ -5,10 +5,10 @@ set -x shutdown -h +60 "Timeout on VM creation" -if [ -e "/vagrant/build.sh" ]; then +if [ -f "/vagrant/build.sh" ]; then bash /vagrant/build.sh fi -if [ -e "/vagrant/build_as_vagrant.sh" ]; then +if [ -f "/vagrant/build_as_vagrant.sh" ]; then su - vagrant -c 'bash /vagrant/build_as_vagrant.sh' fi diff --git a/wine-tibbo/build.sh b/wine-tibbo/build.sh index 9a18a9f..e9ce711 100644 --- a/wine-tibbo/build.sh +++ b/wine-tibbo/build.sh @@ -3,7 +3,7 @@ export DISPLAY=:0.0 export WINEPREFIX="/home/vagrant/.wine" # Install WINE -echo "deb http://httpredir.debian.org/debian jessie-backports main" >> /etc/apt/sources.list +echo "deb http://httpredir.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list dpkg --add-architecture i386 apt-get update apt-get install -y wget xvfb wine/jessie-backports unzip wine32/jessie-backports libwine:i386/jessie-backports wine64/jessie-backports libwine/jessie-backports fonts-wine/jessie-backports @@ -14,4 +14,3 @@ chmod ugo+rx /usr/sbin/tibbo_build # Sanitize chown -R vagrant:vagrant /home/vagrant -chown -R vagrant:vagrant /home/vagrant/.wine -- GitLab