diff --git a/README.md b/README.md index ea3c5b4f4d..d163598b22 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ Please install the following: * `unzip` * `strace` * `curl` +* `git` * ImageMagick * [Clang compiler](http://clang.llvm.org/) version 3.4 or better * [Meteor](http://meteor.com) diff --git a/Vagrantfile b/Vagrantfile index 563f68dc78..81669abaef 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -24,7 +24,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Use a shell script to "provision" the box. This install Sandstorm using # the bundled installer. config.vm.provision "shell", - inline: "cd /vagrant && echo localhost > /etc/hostname && hostname localhost && sudo ./install.sh -d -e" + inline: "cd /vagrant && echo localhost > /etc/hostname && hostname localhost && sudo ./install-dev.sh" # Make the vagrant user part of the sandstorm group so that commands like # `spk dev` work diff --git a/install-dev.sh b/install-dev.sh new file mode 100755 index 0000000000..632703a163 --- /dev/null +++ b/install-dev.sh @@ -0,0 +1,18 @@ +#! /bin/bash + +# Builds and installs Sandstorm from source on Ubuntu Trusty Tahr. + +set -e + +sudo apt-get update +sudo apt-get install git libcap-dev xz-utils imagemagick clang-3.5 zip + +sudo ln -s /usr/bin/clang-3.5 /usr/bin/clang +sudo ln -s /usr/bin/clang++-3.5 /usr/bin/clang + +# Install Meteor +curl https://install.meteor.com/ | sh + +# Build and install Sandstorm +make +make install