From 70c8aef27398ab3dbae4b3721c1f65599afcd1f7 Mon Sep 17 00:00:00 2001
From: Andrew Eikum <aeikum@codeweavers.com>
Date: Wed, 5 Jun 2019 11:23:59 -0500
Subject: [PATCH] Vagrantfile: Allow VMs to be provisioned multiple times

---
 Vagrantfile           | 16 +++++++++-------
 vagrant-user-setup.sh | 10 ++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 92f73cdd..9e1d2c11 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -90,14 +90,15 @@ Vagrant.configure(2) do |config|
     #allow vagrant user to run docker
     adduser vagrant docker
 
-    #download build of recent mingw-w64 with dwarf2 exceptions enabled
-    wget -O /root/dxvk_crosscc.tar.xz 'http://repo.steampowered.com/proton_mingw/proton_mingw-9.1-1.tar.xz'
-    unxz -T0 /root/dxvk_crosscc.tar.xz
-    mkdir -p /srv/chroot/dxvk_crosscc/
-    tar -xf /root/dxvk_crosscc.tar -C /srv/chroot/dxvk_crosscc/
+    if ! schroot -i -c dxvk_crosscc >/dev/null 2>&1; then
+      #download build of recent mingw-w64 with dwarf2 exceptions enabled
+      wget --progress=dot -O /root/dxvk_crosscc.tar.xz 'http://repo.steampowered.com/proton_mingw/proton_mingw-9.1-1.tar.xz'
+      unxz -T0 /root/dxvk_crosscc.tar.xz
+      mkdir -p /srv/chroot/dxvk_crosscc/
+      tar -xf /root/dxvk_crosscc.tar -C /srv/chroot/dxvk_crosscc/
 
-    #install dxvk_crosscc schroot
-    cat > /etc/schroot/chroot.d/dxvk_crosscc <<EOF
+      #install dxvk_crosscc schroot
+      cat > /etc/schroot/chroot.d/dxvk_crosscc <<EOF
 [dxvk_crosscc]
 description=Special mingw-w64 for building DXVK
 type=directory
@@ -106,6 +107,7 @@ users=vagrant
 personality=linux
 preserve-environment=true
 EOF
+    fi
   SHELL
 
   config.vm.provision "shell", privileged: "true", inline: <<-SHELL
diff --git a/vagrant-user-setup.sh b/vagrant-user-setup.sh
index feafd3b2..b759ab5f 100755
--- a/vagrant-user-setup.sh
+++ b/vagrant-user-setup.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 #set up steam runtimes. remove these lines if building without the runtime
-git clone https://github.com/ValveSoftware/steam-runtime.git
-./steam-runtime/setup_docker.sh amd64 --extra-bootstrap=/home/vagrant/proton/steamrt-bootstrap.sh steam-proton-dev
-./steam-runtime/setup_docker.sh i386 --extra-bootstrap=/home/vagrant/proton/steamrt-bootstrap.sh steam-proton-dev32
-(cd steam-runtime && ./build-runtime.py --output=./runtime/)
+if [ ! -e "$HOME/steam-runtime" ]; then
+    git clone https://github.com/ValveSoftware/steam-runtime.git
+    ./steam-runtime/setup_docker.sh amd64 --extra-bootstrap=/home/vagrant/proton/steamrt-bootstrap.sh steam-proton-dev
+    ./steam-runtime/setup_docker.sh i386 --extra-bootstrap=/home/vagrant/proton/steamrt-bootstrap.sh steam-proton-dev32
+    (cd steam-runtime && ./build-runtime.py --output=./runtime/)
+fi