From 545493d1fd3823e7429df297ed7806b92647300a Mon Sep 17 00:00:00 2001 From: Lew Goettner Date: Fri, 17 May 2013 20:47:39 -0400 Subject: [PATCH] [BENTO-41] Check to see if you're on VirtualBox Because vagrant is now multi-provider, you might not want these installed. --- definitions/.common/vagrant.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/definitions/.common/vagrant.sh b/definitions/.common/vagrant.sh index 9368ef636..ae70a2fff 100644 --- a/definitions/.common/vagrant.sh +++ b/definitions/.common/vagrant.sh @@ -1,13 +1,15 @@ #!/bin/bash -eux -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso +if [ -f /home/vagrant/.vbox_version ]; then + mkdir /tmp/vbox + VER=$(cat /home/vagrant/.vbox_version) + wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso + mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox + sh /tmp/vbox/VBoxLinuxAdditions.run + umount /tmp/vbox + rmdir /tmp/vbox + rm *.iso +fi mkdir /home/vagrant/.ssh wget --no-check-certificate \